diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-06 04:09:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 04:09:06 -0800 |
| commit | 8924a302a2470abc56e7d9ef64e0b29ba5b6db0d (patch) | |
| tree | cf6a96d812167f9488e5d4ea9d1fbe272df7acfd /test/e2e | |
| parent | e9c48206019be6b95b5cc8700945b773a857ae26 (diff) | |
| parent | 60bfa305a88c686c91ebc0f8f98ac14405ae10cf (diff) | |
| download | podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.tar.gz podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.tar.bz2 podman-8924a302a2470abc56e7d9ef64e0b29ba5b6db0d.zip | |
Merge pull request #4563 from mheon/fix_change_parsing
Fix parsing for arrays of values in image changes
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/import_test.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 979440a50..bceb30f7c 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -105,7 +105,9 @@ var _ = Describe("Podman import", func() { results.WaitWithDefaultTimeout() Expect(results.ExitCode()).To(Equal(0)) imageData := results.InspectImageJSON() - Expect(imageData[0].Config.Cmd[0]).To(Equal("/bin/bash")) + Expect(imageData[0].Config.Cmd[0]).To(Equal("/bin/sh")) + Expect(imageData[0].Config.Cmd[1]).To(Equal("-c")) + Expect(imageData[0].Config.Cmd[2]).To(Equal("/bin/bash")) }) It("podman import with change flag CMD <path>", func() { @@ -126,6 +128,8 @@ var _ = Describe("Podman import", func() { Expect(results.ExitCode()).To(Equal(0)) imageData := results.InspectImageJSON() Expect(imageData[0].Config.Cmd[0]).To(Equal("/bin/sh")) + Expect(imageData[0].Config.Cmd[1]).To(Equal("-c")) + Expect(imageData[0].Config.Cmd[2]).To(Equal("/bin/sh")) }) It("podman import with change flag CMD [\"path\",\"path'\"", func() { @@ -137,7 +141,7 @@ var _ = Describe("Podman import", func() { export.WaitWithDefaultTimeout() Expect(export.ExitCode()).To(Equal(0)) - importImage := podmanTest.Podman([]string{"import", "--change", "CMD [/bin/bash]", outfile, "imported-image"}) + importImage := podmanTest.Podman([]string{"import", "--change", "CMD [\"/bin/bash\"]", outfile, "imported-image"}) importImage.WaitWithDefaultTimeout() Expect(importImage.ExitCode()).To(Equal(0)) |