Merge pull request #1529 from okurz/fix/s390_debug

bootloader_s390: Fix show_debug if wait_serial does not return anything
os-autoinst · Jul 18, 2016 · db2fb60 · db2fb60
2 parents 2426d58 + 3752fd1
commit db2fb60
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/installation/bootloader_s390.pm b/tests/installation/bootloader_s390.pm
@@ -193,13 +193,13 @@ sub format_dasd() {
 
     # make sure that there is a dasda device
     $r = script_run("lsdasd");
-    show_debug() and die "dasd_configure died with exit code $r" unless ($r == 0);
+    show_debug() and die "dasd_configure died with exit code $r" unless ($r && $r == 1);
 
     assert_screen("ensure-dasd-exists");
 
     # format dasda (this can take up to 20 minutes depending on disk size)
     $r = script_run("echo yes | dasdfmt -b 4096 -p /dev/dasda", 1200);
-    show_debug() and die "dasdfmt died with exit code $r" unless ($r == 0);
+    show_debug() and die "dasdfmt died with exit code $r" unless ($r && $r == 1);
 }
 
 sub run() {