diff options
author | Adrian Reber <areber@redhat.com> | 2019-07-29 11:38:30 +0000 |
---|---|---|
committer | Adrian Reber <areber@redhat.com> | 2019-07-29 14:24:08 +0200 |
commit | 90ffba92e9c931a8b972c2104ad1831b8721fdc7 (patch) | |
tree | 14767789f8172988ce159067e7d4d2ab6a2ada18 /test/e2e/checkpoint_test.go | |
parent | 2c98bd5398979109cf3ddc3cbe4e3400b67d74ac (diff) | |
download | podman-90ffba92e9c931a8b972c2104ad1831b8721fdc7.tar.gz podman-90ffba92e9c931a8b972c2104ad1831b8721fdc7.tar.bz2 podman-90ffba92e9c931a8b972c2104ad1831b8721fdc7.zip |
Move random IP code for tests from checkpoint to common
The function to generate random IP addresses during ginkgo tests in
the checkpoint test code is moved to common and all tests using
hardcoded IP addresses have been changed to use random IP addresses to
reduce test errors when running the tests in parallel.
Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'test/e2e/checkpoint_test.go')
-rw-r--r-- | test/e2e/checkpoint_test.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index b77c48c8e..8f3cf5c10 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -3,12 +3,9 @@ package integration import ( - "math/rand" "net" "os" "os/exec" - "strconv" - "time" "github.com/containers/libpod/pkg/criu" . "github.com/containers/libpod/test/utils" @@ -17,12 +14,8 @@ import ( ) func getRunString(input []string) []string { - // To avoid IP collisions of initialize random seed for random IP addresses - rand.Seed(time.Now().UnixNano()) - ip3 := strconv.Itoa(rand.Intn(230) + GinkgoParallelNode()) - ip4 := strconv.Itoa(rand.Intn(230) + GinkgoParallelNode()) // CRIU does not work with seccomp correctly on RHEL7 : seccomp=unconfined - runString := []string{"run", "-it", "--security-opt", "seccomp=unconfined", "-d", "--ip", "10.88." + ip3 + "." + ip4} + runString := []string{"run", "-it", "--security-opt", "seccomp=unconfined", "-d", "--ip", GetRandomIPAddress()} return append(runString, input...) } |