File tree 1 file changed +5
-3
lines changed
tests/alternates/building-on-matlab-docker-image
1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -56,16 +56,18 @@ def test_no_entry_option(self):
56
56
self .assertIn (expected_login_msg .lower (), output .lower ())
57
57
58
58
def test_shell_option (self ):
59
- """Test that if the '-shell' option is specified, then a '/bin/bash' process is started"""
60
- expected_shell = "/bin/bash"
59
+ """Test that if the '-shell' option is specified, then a 'bash' process is started"""
60
+ expected_shell_before_22b = "/bin/bash"
61
+ expected_shell_after_23a = "bash"
62
+ expected_shell = expected_shell_after_23a if helpers .get_release ().lower () >= "r2023a" else expected_shell_before_22b
61
63
self .container = self .client .containers .run (
62
64
image = self .image_name ,
63
65
detach = True ,
64
66
stdin_open = True ,
65
67
command = "-shell" ,
66
68
)
67
69
host = testinfra .get_host ("docker://" + self .container .id )
68
- helpers .wait_for_cmd (self .container , expected_shell )
70
+ helpers .wait_for_cmd (self .container , expected_shell , timeout = 5 )
69
71
70
72
running_procs = host .check_output ("ps -x -o cmd" )
71
73
self .assertIn (expected_shell , running_procs )
You can’t perform that action at this time.
0 commit comments