SecComms: Fix flaky tests #2154
Open
+73
−90
Conversation
This file contains 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
Fixes: confidential-containers#2153 Seperate ListenAndServe() of test servers to perform Listen() in the same thread as used by the client that rely on the server port to be open. Move to reuse tuntest network namespace test code rather that maintaining seperate network namespace test code for SecureComms. Signed-off-by: David Hadas <davidh@il.ibm.com>
| test.HttpServer(forwarder.DefaultListenPort) | ||
| s9009 := test.HttpServer(forwarder.DefaultListenPort) | ||
| if s9009 == nil { | ||
| t.Error("Failed - not create server") |
There was a problem hiding this comment.
Is this supposed to be Failed - could not create server?
| @@ -208,6 +208,9 @@ func TestPpssh(t *testing.T) { | |||
| } | |||
|
|
|||
| s := test.HttpServer("7105") | |||
| if s == nil { | |||
| t.Error("Failed - not create server") | |||
| if err := netlink.LinkSetUp(link); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| ns, namespace := tuntest.NewNamedNS(t, "test-TestSshProxyWithNamespace") |
There was a problem hiding this comment.
Are these the right variable names as I assumed that ns was short for namespace?
| @@ -113,6 +109,9 @@ func TestSshProxy(t *testing.T) { | |||
| serverSshPeer.Ready() | |||
|
|
|||
| s := test.HttpServer("7020") | |||
| if s == nil { | |||
| t.Error("Failed - not create server") | |||
There was a problem hiding this comment.
Okay, as it's in lots of places I think find and replace will be easier than me commenting everywhere.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #2153
Seperate ListenAndServe() of test servers to perform Listen() in the same thread as used by the client that rely on the server port to be open.
Move to reuse tuntest network namespace test code rather that maintaining seperate network namespace test code for SecureComms.