diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/e2e/containers_conf_test.go | 4 | ||||
-rw-r--r-- | test/e2e/prune_test.go | 2 | ||||
-rw-r--r-- | test/e2e/ps_test.go | 2 | ||||
-rw-r--r-- | test/python/dockerpy/tests/test_images.py | 2 | ||||
-rw-r--r-- | test/system/030-run.bats | 6 | ||||
-rw-r--r-- | test/system/070-build.bats | 21 | ||||
-rw-r--r-- | test/utils/common_function_test.go | 4 |
7 files changed, 32 insertions, 9 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 1054f55f6..8339b7732 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -93,7 +93,7 @@ var _ = Describe("Podman run", func() { Expect(session.OutputToString()).ToNot(Equal(cap.OutputToString())) }) - It("podman Regular capabilties", func() { + It("podman Regular capabilities", func() { SkipIfRootless() os.Setenv("CONTAINERS_CONF", "config/containers.conf") setup := podmanTest.RunTopContainer("test1") @@ -105,7 +105,7 @@ var _ = Describe("Podman run", func() { Expect(result.OutputToString()).To(ContainSubstring("NET_RAW")) }) - It("podman drop capabilties", func() { + It("podman drop capabilities", func() { os.Setenv("CONTAINERS_CONF", "config/containers-caps.conf") setup := podmanTest.RunTopContainer("test1") setup.WaitWithDefaultTimeout() diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 1d592a42d..9c9d85194 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -261,7 +261,7 @@ var _ = Describe("Podman prune", func() { // Two as pods infra container and one newly created. Expect(podmanTest.NumberOfContainers()).To(Equal(3)) - // image list current count should not be pruned if all flag isnt enabled + // image list current count should not be pruned if all flag isn't enabled session = podmanTest.Podman([]string{"images"}) session.WaitWithDefaultTimeout() numberOfImages := len(session.OutputToStringArray()) diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index a2338c924..66233412c 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -484,7 +484,7 @@ var _ = Describe("Podman ps", func() { Expect(ps.OutputToString()).To(ContainSubstring("0.0.0.0:8080->80/tcp")) }) - It("podman ps truncate long create commad", func() { + It("podman ps truncate long create command", func() { session := podmanTest.Podman([]string{"run", ALPINE, "echo", "very", "long", "create", "command"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/python/dockerpy/tests/test_images.py b/test/python/dockerpy/tests/test_images.py index 5eae61c2f..602a86de2 100644 --- a/test/python/dockerpy/tests/test_images.py +++ b/test/python/dockerpy/tests/test_images.py @@ -59,7 +59,7 @@ class TestImages(unittest.TestCase): self.assertFalse # Validates if name updates when the image is retagged. - @unittest.skip("dosent work now") + @unittest.skip("doesn't work now") def test_retag_valid_image(self): client.tag(constant.ALPINE_SHORTNAME, "demo", "rename") alpine_image = client.inspect_image(constant.ALPINE) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 4e518c571..518d902a7 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -61,6 +61,12 @@ echo $rand | 0 | $rand is "$tests_run" "$(grep . <<<$tests | wc -l)" "Ran the full set of tests" } +@test "podman run - globle runtime option" { + skip_if_remote "runtime flag is not passing over remote" + run_podman 126 --runtime-flag invalidflag run --rm $IMAGE + is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime" +} + # 'run --preserve-fds' passes a number of additional file descriptors into the container @test "podman run --preserve-fds" { skip_if_remote "preserve-fds is meaningless over remote" diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 997699ecb..66f6610ea 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -30,9 +30,26 @@ EOF run_podman rmi -f build_test } +@test "podman build - global runtime flags test" { + skip_if_remote "FIXME: pending #7136" + + rand_content=$(random_string 50) + + tmpdir=$PODMAN_TMPDIR/build-test + run mkdir -p $tmpdir + containerfile=$tmpdir/Containerfile + cat >$containerfile <<EOF +FROM $IMAGE +RUN echo $rand_content +EOF + + run_podman 125 --runtime-flag invalidflag build -t build_test $tmpdir + is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime" +} + # Regression from v1.5.0. This test passes fine in v1.5.0, fails in 1.6 @test "podman build - cache (#3920)" { - skip_if_remote "FIXME: pending #7136" + skip_if_remote "FIXME: pending #7136, runtime flag is not passing over remote" if is_remote && is_rootless; then skip "unreliable with podman-remote and rootless; #2972" fi @@ -128,7 +145,7 @@ echo "\$1" printenv | grep MYENV | sort | sed -e 's/^MYENV.=//' EOF - # For overridding with --env-file + # For overriding with --env-file cat >$PODMAN_TMPDIR/env-file <<EOF MYENV3=$s_env3 http_proxy=http-proxy-in-env-file diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index 26bb8b473..0bbc31d5b 100644 --- a/test/utils/common_function_test.go +++ b/test/utils/common_function_test.go @@ -75,10 +75,10 @@ var _ = Describe("Common functions test", func() { Expect(newer).To(Equal(expect), "Version compare results is not as expect.") Expect(err == nil).To(Equal(isNil), "Error is not as expect.") }, - Entry("Invlid kernel version: 0", "0", false, false), + Entry("Invalid kernel version: 0", "0", false, false), Entry("Older kernel version:0.0", "0.0", true, true), Entry("Newer kernel version: 100.17.14", "100.17.14", false, true), - Entry("Invlid kernel version: I am not a kernel version", "I am not a kernel version", false, false), + Entry("Invalid kernel version: I am not a kernel version", "I am not a kernel version", false, false), ) DescribeTable("Test TestIsCommandAvailable", |