File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -623,7 +623,14 @@ def run(self,
623
623
img_id = str (docker_req ["dockerPull" ])
624
624
cmd = [user_space_docker_cmd , "pull" , img_id ]
625
625
_logger .info (Text (cmd ))
626
- subprocess .check_call (cmd , stdout = sys .stderr )
626
+ try :
627
+ subprocess .check_call (cmd , stdout = sys .stderr )
628
+ except OSError :
629
+ raise WorkflowException (SourceLine (docker_req ).makeError (
630
+ "Either Docker container {} is not available with "
631
+ "user space docker implementation {} or {} is missing "
632
+ "or broken." .format (img_id , user_space_docker_cmd ,
633
+ user_space_docker_cmd )))
627
634
else :
628
635
raise WorkflowException (SourceLine (docker_req ).makeError (
629
636
"Docker image must be specified as 'dockerImageId' or "
Original file line number Diff line number Diff line change @@ -954,7 +954,7 @@ def test_bad_userspace_runtime(factor):
954
954
"--user-space-docker-cmd=quaquioN" , "--default-container=debian" ,
955
955
get_data (test_file ), get_data (job_file )])
956
956
error_code , stdout , stderr = get_main_output (commands )
957
- assert "'quaquioN' not found:" in stderr or "No such file or directory: 'quaquioN' " in stderr , stderr
957
+ assert "or quaquioN is missing or broken " in stderr , stderr
958
958
assert error_code == 1
959
959
960
960
@windows_needs_docker
You can’t perform that action at this time.
0 commit comments