diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-05-31 16:49:40 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-05-31 16:49:40 +0200 |
| commit | 205c8c071e8550b2ddd57cfaa71af7345cfd5fe7 (patch) | |
| tree | 5e95293441a8aaef0952bcf9236eba82c4a76375 /test/e2e | |
| parent | dc67e6a182a09c8b65ef139fb9f15ddfdecae70f (diff) | |
| download | podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.tar.gz podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.tar.bz2 podman-205c8c071e8550b2ddd57cfaa71af7345cfd5fe7.zip | |
fix podman container restore without CreateNetNS
When a container does not use the default podman netns, for example
--network none or --network ns:/path a restore would fail because the
specgen check validates that c.config.StaticMAC is nil but the
unmarshaller sets it to an empty slice.
While we could make the check use len() > 0 I feel like it is more
common to check with != nil for ip and mac addresses.
Adding omitempty tag makes the json marshal/unmarshal work correctly.
This should not cause any issues.
Fixes #14389
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/checkpoint_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 787178cd3..1da199714 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -676,8 +676,8 @@ var _ = Describe("Podman checkpoint", func() { }) It("podman checkpoint and restore container with root file-system changes using --ignore-rootfs during restore", func() { // Start the container - localRunString := getRunString([]string{"--rm", ALPINE, "top"}) - session := podmanTest.Podman(localRunString) + // test that restore works without network namespace (https://github.com/containers/podman/issues/14389) + session := podmanTest.Podman([]string{"run", "--network=none", "-d", "--rm", ALPINE, "top"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) |