Skip to content

Commit

Permalink
Merge branch 'stability/parallel-tests' of ssh://github.com/solo-io/g…
Browse files Browse the repository at this point in the history
…loo into stability/parallel-tests
  • Loading branch information
sam-heilbron committed Jun 30, 2023
2 parents d6b2c0b + 58cacde commit 617e929
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/ginkgo/parallel/ports.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func portInUseDenylist(proposedPort uint32) error {

// AdvancePortSafeListen returns a port that is safe to use in parallel tests
// It relies on pinging the port to see if it is in use
// This may be slow than using a denylist, but it is more robust
// This may be slower than using a denylist, but it is more robust
func AdvancePortSafeListen(p *uint32) uint32 {
return AdvancePortSafe(p, portInUseListen)
}
Expand Down
2 changes: 1 addition & 1 deletion test/services/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func ExecOnContainer(containerName string, args []string) ([]byte, error) {
func MustStopAndRemoveContainer(containerName string) {
StopContainer(containerName)

// We assumed that the container was run with auto-remove, and thus stopping the container will cause it to be removed
// We assume that the container was run with auto-remove, and thus stopping the container will cause it to be removed
err := WaitUntilContainerRemoved(containerName)
Expect(err).ToNot(HaveOccurred())

Expand Down

0 comments on commit 617e929

Please sign in to comment.