diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-09-07 05:47:05 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-09-12 16:20:01 -0400 |
| commit | 82ac0d8925dbb5aa738f1494ecb002eb6daca992 (patch) | |
| tree | fcb1d2961f223806b228e7c930bc134fc9f0f7fd /test | |
| parent | 535111b5d5cfa0d203df77e6d6b0b69eda46bb82 (diff) | |
| download | podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.tar.gz podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.tar.bz2 podman-82ac0d8925dbb5aa738f1494ecb002eb6daca992.zip | |
Podman-remote run should wait for exit code
This change matches what is happening on the podman local side
and should eliminate a race condition.
Also exit commands on the server side should start to return to client.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_exit_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/run_selinux_test.go | 2 | ||||
| -rw-r--r-- | test/system/030-run.bats | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index fc8b52120..374705879 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -1,5 +1,3 @@ -// +build !remoteclient - package integration import ( diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index dfe71531a..0c78ab15b 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -162,7 +162,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "-it", "--security-opt", "label=type:spc_t", "--security-opt", "label=filetype:foobar", fedoraMinimal, "ls", "-Z", "/dev"}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(127)) + Expect(session.ExitCode()).To(Equal(126)) }) }) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index f279a0c75..760ed6a18 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -60,7 +60,6 @@ echo $rand | 0 | $rand # 'run --rm' goes through different code paths and may lose exit status. # See https://github.com/containers/libpod/issues/3795 @test "podman run --rm" { - skip_if_remote "podman-remote does not handle exit codes" run_podman 0 run --rm $IMAGE /bin/true run_podman 1 run --rm $IMAGE /bin/false |