From fb89e6f2759e2efd14bb8b0b27b1aacb3ad30c65 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 24 May 2019 16:44:37 -0700
Subject: [PATCH] Update qemu arguments to work correctly with nographic

Add -monitor none to turn off the qemu monitor multiplexing.
Pass -boot d for -cdrom booting instead of 'c'.

Add 'console=ttyS0,115200n8' to the boot arguments so that kernel output
will show up on the serial port.
---
 tests/cli/test_compose_live-iso.sh | 2 +-
 tests/cli/test_compose_qcow2.sh    | 2 +-
 tests/test_cli.sh                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh
index 822a7144..840004fd 100755
--- a/tests/cli/test_compose_live-iso.sh
+++ b/tests/cli/test_compose_live-iso.sh
@@ -46,7 +46,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "Start VM instance"
-        rlRun -t -c "$QEMU -m 2048 -boot c -cdrom $IMAGE -nographic \
+        rlRun -t -c "$QEMU -m 2048 -boot d -cdrom $IMAGE -nographic -monitor none \
                            -net user,id=nic0,hostfwd=tcp::2222-:22 -net nic &"
         # 60 seconds timeout at boot menu screen
         # then media check + boot ~ 30 seconds
diff --git a/tests/cli/test_compose_qcow2.sh b/tests/cli/test_compose_qcow2.sh
index b8ce8927..f9f65ace 100755
--- a/tests/cli/test_compose_qcow2.sh
+++ b/tests/cli/test_compose_qcow2.sh
@@ -74,7 +74,7 @@ __EOF__
     rlPhaseEnd
 
     rlPhaseStartTest "Start VM instance"
-        rlRun -t -c "$QEMU -m 2048 -boot c -hda $IMAGE -nographic \
+        rlRun -t -c "$QEMU -m 2048 -boot c -hda $IMAGE -nographic -monitor none \
                            -net user,id=nic0,hostfwd=tcp::2222-:22 -net nic &"
         sleep 60
     rlPhaseEnd
diff --git a/tests/test_cli.sh b/tests/test_cli.sh
index 0786b4aa..3cb3ec78 100755
--- a/tests/test_cli.sh
+++ b/tests/test_cli.sh
@@ -32,7 +32,7 @@ function setup_tests {
     cat >> $blueprints_dir/example-http-server.toml << __EOF__
 
 [customizations.kernel]
-append = "custom_cmdline_arg"
+append = "custom_cmdline_arg console=ttyS0,115200n8"
 __EOF__
 }