diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-10 12:01:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-10 12:01:45 +0200 |
| commit | 8c77dd77af6852d1980949730663fc6814aacbdf (patch) | |
| tree | 4876840fa141dd1a17bfb50e66103ea0e234318d /test | |
| parent | d65cb664379117de527aeb253f1d4230998d2939 (diff) | |
| parent | 0c9a941d01b26c94050bf9195f2d0611424a2c70 (diff) | |
| download | podman-8c77dd77af6852d1980949730663fc6814aacbdf.tar.gz podman-8c77dd77af6852d1980949730663fc6814aacbdf.tar.bz2 podman-8c77dd77af6852d1980949730663fc6814aacbdf.zip | |
Merge pull request #3742 from adrianreber/ConmonPidFile
Conmon pid file
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/checkpoint_test.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index d37d7c7cc..1caefd299 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -375,23 +375,28 @@ var _ = Describe("Podman checkpoint", func() { result := podmanTest.Podman([]string{"container", "checkpoint", "-l", "-e", fileName}) result.WaitWithDefaultTimeout() + // As the container has been started with '--rm' it will be completely + // cleaned up after checkpointing. Expect(result.ExitCode()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0)) - result = podmanTest.Podman([]string{"container", "restore", "-i", fileName}) + // Restore container the first time with different name. + // Using '--ignore-static-ip' as for parallel test runs + // each containers gets a random IP address via '--ip'. + // '--ignore-static-ip' tells the restore to use the next + // available IP address. + // First restore the container with a new name/ID to make + // sure nothing in the restored container depends on the + // original container. + result = podmanTest.Podman([]string{"container", "restore", "-i", fileName, "-n", "restore_again", "--ignore-static-ip"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) Expect(podmanTest.GetContainerStatus()).To(ContainSubstring("Up")) - // Restore container a second time with different name. - // Using '--ignore-static-ip' as for parallel test runs - // each containers gets a random IP address via '--ip'. - // '--ignore-static-ip' tells the restore to use the next - // available IP address. - result = podmanTest.Podman([]string{"container", "restore", "-i", fileName, "-n", "restore_again", "--ignore-static-ip"}) + result = podmanTest.Podman([]string{"container", "restore", "-i", fileName}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) |