summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Reber <areber@redhat.com>2019-08-06 20:47:39 +0000
committerAdrian Reber <areber@redhat.com>2019-08-09 19:26:57 +0200
commit0c9a941d01b26c94050bf9195f2d0611424a2c70 (patch)
tree4229f747abf240145e62904b8cb3c135d2952de4
parenta891b845285105615c61d749fb61ca2650ba509b (diff)
downloadpodman-0c9a941d01b26c94050bf9195f2d0611424a2c70.tar.gz
podman-0c9a941d01b26c94050bf9195f2d0611424a2c70.tar.bz2
podman-0c9a941d01b26c94050bf9195f2d0611424a2c70.zip
Test that restored container does not depend on the original container
In the restore from external checkpoint archive test, the second restore using a new name and ID is now done first to ensure that nothing in the restored container depends on the original container. Test has been adapted to catch errors like the one fixed with the previous commit to adapt ConmonPidFile for restored containers. Signed-off-by: Adrian Reber <areber@redhat.com>
-rw-r--r--test/e2e/checkpoint_test.go19
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))