Merge 3cf0442 into 5dda214

weldr · May 25, 2019 · 2180861 · 2180861
2 parents 5dda214 + 3cf0442
commit 2180861
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/test/check-cli b/test/check-cli
@@ -1,7 +1,6 @@
 #!/usr/bin/python3
 
 import composertest
-import unittest
 
 
 class TestSanity(composertest.ComposerTestCase):
@@ -25,7 +24,6 @@ class TestImages(composertest.ComposerTestCase):
     def test_qcow2(self):
         self.runCliTest("/tests/cli/test_compose_qcow2.sh")
 
-    @unittest.skip("https://github.com/weldr/lorax/issues/731")
     def test_live_iso(self):
         self.runCliTest("/tests/cli/test_compose_live-iso.sh")
 

diff --git a/tests/cli/test_compose_live-iso.sh b/tests/cli/test_compose_live-iso.sh
@@ -39,7 +39,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
@@ -67,7 +67,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
@@ -21,7 +21,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__
 }