Skip to content

Commit 4d05ffc

Browse files
committed
Merge pull request #478 from cevich/fix_run_exec
Fix run exec
2 parents 6804542 + 30f4b8b commit 4d05ffc

File tree

2 files changed

+116
-246
lines changed

2 files changed

+116
-246
lines changed

config_defaults/subtests/docker_cli/run_exec.ini

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,13 @@ run_options_csv = --interactive
77
bash_cmd = /bin/sh
88
#: modifies the execning command in started container)
99
exec_options_csv = --interactive
10-
#: csv command prefix (docker exec ... $exec_bash_cmd $cmd)
11-
exec_bash_cmd = /bin/sh,-c
12-
#: Specifies the executed command inside the container
13-
cmd =
1410
#: expected exit status
15-
exit_status =
16-
subsubtests = exec_true, exec_false, exec_pid_count, detached_pid_count, smoke_pid_count
17-
18-
[docker_cli/run_exec/exec_true]
19-
cmd = /bin/true
2011
exit_status = 0
12+
subsubtests = exec_true, exec_false, exec_pid_count
2113

2214
[docker_cli/run_exec/exec_false]
23-
cmd = /bin/false
2415
exit_status = 1
2516

2617
[docker_cli/run_exec/exec_pid_count]
27-
exec_bash_cmd = /bin/sh
28-
#: Expected count of pid in container when command using exec is started.
29-
pid_count = 3
30-
cmd =
31-
exit_status = 0
32-
33-
[docker_cli/run_exec/detached_pid_count]
34-
exec_bash_cmd = /bin/sh
35-
#: Expected count of pid in container when command using exec is started.
36-
exec_options_csv = --interactive,--detach
3718
#: Expected count of pid in container when command using exec is started.
38-
pid_count = 3
39-
cmd =
40-
exit_status = 0
41-
42-
43-
[docker_cli/run_exec/smoke_pid_count]
44-
exec_bash_cmd = /bin/sh
45-
#: Expected count of pid in container when command using exec is started.
46-
exec_options_csv = --interactive,--detach
47-
#: Expected count of pid in container when command using exec is started.
48-
pid_count = 200
49-
cmd =
50-
exit_status = 0
19+
pid_count = 2

0 commit comments

Comments
 (0)