-
Notifications
You must be signed in to change notification settings - Fork 733
test: refactor compose_port_linux_test.go to use Tigron #4713
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
robertcal
wants to merge
1
commit into
containerd:main
Choose a base branch
from
robertcal:issues_463_compose_port_linux_test.go
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,6 @@ import ( | |
| ) | ||
|
|
||
| func TestComposePort(t *testing.T) { | ||
| base := testutil.NewBase(t) | ||
|
|
||
| var dockerComposeYAML = fmt.Sprintf(` | ||
| services: | ||
| svc0: | ||
|
|
@@ -40,22 +38,44 @@ services: | |
| - "12346:10001/udp" | ||
| `, testutil.CommonImage) | ||
|
|
||
| comp := testutil.NewComposeDir(t, dockerComposeYAML) | ||
| defer comp.CleanUp() | ||
| projectName := comp.ProjectName() | ||
| t.Logf("projectName=%q", projectName) | ||
|
Comment on lines
-45
to
-46
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you write these in |
||
| testCase := nerdtest.Setup() | ||
|
|
||
| testCase.NoParallel = true | ||
|
|
||
| testCase.Setup = func(data test.Data, helpers test.Helpers) { | ||
| compYamlPath := data.Temp().Save(dockerComposeYAML, "compose.yaml") | ||
| data.Labels().Set("composeYaml", compYamlPath) | ||
|
|
||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d").AssertOK() | ||
| defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").AssertOK() | ||
| helpers.Ensure("compose", "-f", compYamlPath, "up", "-d") | ||
| } | ||
|
|
||
| testCase.Cleanup = func(data test.Data, helpers test.Helpers) { | ||
| helpers.Anyhow("compose", "-f", data.Temp().Path("compose.yaml"), "down", "-v") | ||
| } | ||
|
|
||
| testCase.SubTests = []*test.Case{ | ||
| { | ||
| Description: "port should return host port for TCP", | ||
| NoParallel: true, | ||
| Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { | ||
| return helpers.Command("compose", "-f", data.Labels().Get("composeYaml"), "port", "svc0", "10000") | ||
| }, | ||
| Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Equals("0.0.0.0:12345\n")), | ||
| }, | ||
| { | ||
| Description: "port should return host port for UDP", | ||
| NoParallel: true, | ||
| Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { | ||
| return helpers.Command("compose", "-f", data.Labels().Get("composeYaml"), "port", "--protocol", "udp", "svc0", "10001") | ||
| }, | ||
| Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Equals("0.0.0.0:12346\n")), | ||
| }, | ||
| } | ||
|
|
||
| // `port` should work for given port and protocol | ||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "port", "svc0", "10000").AssertOutExactly("0.0.0.0:12345\n") | ||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "port", "--protocol", "udp", "svc0", "10001").AssertOutExactly("0.0.0.0:12346\n") | ||
| testCase.Run(t) | ||
| } | ||
|
|
||
| func TestComposePortFailure(t *testing.T) { | ||
| base := testutil.NewBase(t) | ||
|
|
||
| var dockerComposeYAML = fmt.Sprintf(` | ||
| services: | ||
| svc0: | ||
|
|
@@ -66,18 +86,49 @@ services: | |
| - "12346:10001/udp" | ||
| `, testutil.CommonImage) | ||
|
|
||
| comp := testutil.NewComposeDir(t, dockerComposeYAML) | ||
| defer comp.CleanUp() | ||
| projectName := comp.ProjectName() | ||
| t.Logf("projectName=%q", projectName) | ||
| testCase := nerdtest.Setup() | ||
|
|
||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d").AssertOK() | ||
| defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").AssertOK() | ||
| testCase.NoParallel = true | ||
|
|
||
| // `port` should fail if given port and protocol don't exist | ||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "port", "svc0", "9999").AssertFail() | ||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "port", "--protocol", "udp", "svc0", "10000").AssertFail() | ||
| base.ComposeCmd("-f", comp.YAMLFullPath(), "port", "--protocol", "tcp", "svc0", "10001").AssertFail() | ||
| testCase.Setup = func(data test.Data, helpers test.Helpers) { | ||
| compYamlPath := data.Temp().Save(dockerComposeYAML, "compose.yaml") | ||
| data.Labels().Set("composeYaml", compYamlPath) | ||
|
|
||
| helpers.Ensure("compose", "-f", compYamlPath, "up", "-d") | ||
| } | ||
|
|
||
| testCase.Cleanup = func(data test.Data, helpers test.Helpers) { | ||
| helpers.Anyhow("compose", "-f", data.Temp().Path("compose.yaml"), "down", "-v") | ||
| } | ||
|
|
||
| testCase.SubTests = []*test.Case{ | ||
| { | ||
| Description: "port should fail for non-existent port", | ||
| NoParallel: true, | ||
| Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { | ||
| return helpers.Command("compose", "-f", data.Labels().Get("composeYaml"), "port", "svc0", "9999") | ||
| }, | ||
| Expected: test.Expects(expect.ExitCodeGenericFail, nil, nil), | ||
| }, | ||
| { | ||
| Description: "port should fail for wrong protocol (UDP on TCP port)", | ||
| NoParallel: true, | ||
| Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { | ||
| return helpers.Command("compose", "-f", data.Labels().Get("composeYaml"), "port", "--protocol", "udp", "svc0", "10000") | ||
| }, | ||
| Expected: test.Expects(expect.ExitCodeGenericFail, nil, nil), | ||
| }, | ||
| { | ||
| Description: "port should fail for wrong protocol (TCP on UDP port)", | ||
| NoParallel: true, | ||
| Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { | ||
| return helpers.Command("compose", "-f", data.Labels().Get("composeYaml"), "port", "--protocol", "tcp", "svc0", "10001") | ||
| }, | ||
| Expected: test.Expects(expect.ExitCodeGenericFail, nil, nil), | ||
| }, | ||
| } | ||
|
|
||
| testCase.Run(t) | ||
| } | ||
|
|
||
| // TestComposeMultiplePorts tests whether it is possible to allocate a large | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please re-write to get host port using
portlockpackage ?https://github.com/containerd/nerdctl/blob/main/pkg/testutil/portlock/portlock.go
Please correct the affected areas.
Additionally, please verify whether other sections can also be rewritten.