Skip to content

Commit 2dd6bde

Browse files
Merge pull request os-autoinst#23809 from ricardobranco777/toolbox
toolbox: Fix missing -u option & add soft-failure for bsc#1252754
2 parents 380d24b + c7c4f5e commit 2dd6bde

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

tests/microos/toolbox.pm

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,18 @@ sub run {
100100
validate_script_output 'podman ps -a', sub { m/test_name/ };
101101
assert_script_run 'podman rm test_name';
102102

103-
104103
record_info 'Test', "Rootless toolbox as $user";
105104
my $console = select_console 'user-console';
106-
my $uid = script_output 'id -u';
107-
validate_script_output 'toolbox -u id', sub { m/uid=${uid}\(${user}\)/ }, timeout => 300;
108-
die "$user shouldn't have access to /etc/passwd!" if (script_run('toolbox -u touch /etc/passwd') == 0);
109-
# Check if toolbox sees processes from outside the container (there should be no pid namespace separation)
110-
background_script_run 'sleep 3612';
111-
validate_script_output 'toolbox ps a', sub { m/sleep 3612/ };
105+
if (is_sle_micro("<6.0")) {
106+
record_soft_failure("bsc#1252754 - toolbox failure for SLEM containter 5.2 - 5.5. unable to open container due to ptmx");
107+
} else {
108+
my $uid = script_output 'id -u';
109+
validate_script_output 'toolbox -u id', sub { m/uid=${uid}\(${user}\)/ }, timeout => 300;
110+
die "$user shouldn't have access to /etc/passwd!" if (script_run('toolbox -u touch /etc/passwd') == 0);
111+
# Check if toolbox sees processes from outside the container (there should be no pid namespace separation)
112+
background_script_run 'sleep 3612';
113+
validate_script_output 'toolbox ps a', sub { m/sleep 3612/ };
114+
}
112115

113116
record_info 'Test', "Rootfull toolbox as $user";
114117
validate_script_output 'toolbox -r id', sub { m/uid=0\(root\)/ };
@@ -127,7 +130,7 @@ sub run {
127130
} else {
128131
assert_script_run 'toolbox -r -- zypper -n ref', timeout => 300;
129132
}
130-
if (script_run('toolbox -- zypper -n up 2>&1 | tee /var/tmp/toolbox_zypper_up.txt', timeout => 300) != 0) {
133+
if (script_run('toolbox -r -- zypper -n up 2>&1 | tee /var/tmp/toolbox_zypper_up.txt', timeout => 300) != 0) {
131134
upload_logs('/var/tmp/toolbox_zypper_up.txt');
132135
die "zypper up failed within toolbox";
133136
}

0 commit comments

Comments
 (0)