summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAditya Rajan <arajan@redhat.com>2021-12-17 14:40:24 +0530
committerAditya Rajan <arajan@redhat.com>2021-12-17 16:20:03 +0530
commit6423174c67d486522354806bf326c843c07d18c1 (patch)
tree93705c2af58b257dd07b01622ffd9ebc71d4ac3f
parentf566d8b8e5351393c03bc0ff475a18174e57af3f (diff)
downloadpodman-6423174c67d486522354806bf326c843c07d18c1.tar.gz
podman-6423174c67d486522354806bf326c843c07d18c1.tar.bz2
podman-6423174c67d486522354806bf326c843c07d18c1.zip
tests: adjust old build test to expect exit code
Old build tests were expecting genric error code `125` however another commit in this PR ensures that we relay exact exit code from build to registry. Hence adjusting tests Signed-off-by: Aditya Rajan <arajan@redhat.com>
-rw-r--r--test/e2e/build_test.go8
-rw-r--r--test/system/070-build.bats2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index f4511860d..5ed873f78 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -275,8 +275,8 @@ RUN printenv http_proxy`, ALPINE)
It("podman build relay exit code to process", func() {
if IsRemote() {
- // following states true for all the remote commands
- Skip("Remote server does not emits error with exit status")
+ podmanTest.StopRemoteService()
+ podmanTest.StartRemoteService()
}
podmanTest.AddImageToRWStore(ALPINE)
dockerfile := fmt.Sprintf(`FROM %s
@@ -663,7 +663,7 @@ RUN ls /dev/fuse`, ALPINE)
Expect(err).To(BeNil())
session := podmanTest.Podman([]string{"build", "--pull-never", "-t", "test", "--file", containerfilePath, podmanTest.TempDir})
session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(125))
+ Expect(session).Should(Exit(1))
session = podmanTest.Podman([]string{"build", "--pull-never", "--device", "/dev/fuse", "-t", "test", "--file", containerfilePath, podmanTest.TempDir})
session.WaitWithDefaultTimeout()
@@ -679,7 +679,7 @@ RUN ls /dev/test1`, ALPINE)
Expect(err).To(BeNil())
session := podmanTest.Podman([]string{"build", "--pull-never", "-t", "test", "--file", containerfilePath, podmanTest.TempDir})
session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(125))
+ Expect(session).Should(Exit(1))
session = podmanTest.Podman([]string{"build", "--pull-never", "--device", "/dev/zero:/dev/test1", "-t", "test", "--file", containerfilePath, podmanTest.TempDir})
session.WaitWithDefaultTimeout()
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 3c47b1f5b..5e920506d 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -115,7 +115,7 @@ FROM $IMAGE
RUN echo $rand_content
EOF
- run_podman 125 --runtime-flag invalidflag build -t build_test $tmpdir
+ run_podman 1 --runtime-flag invalidflag build -t build_test $tmpdir
is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime"
}