misc tweaks

2 files changed, 21 insertions, 11 deletions

diff --git a/tests/basic.py b/tests/basic.py
index de929d5..006cd79 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -41,7 +41,7 @@ class BaseDRM(TestDRM):
         drminfo = self.console_wait('---root---')
         self.write_text(vga, "drminfo", drminfo)
         if not "framebuffer formats" in drminfo:
-            self.fail("device not present");
+            self.fail("drm device missing");
 
         self.console_run('drminfo -F')
         formats = self.console_wait('---root---')
@@ -53,7 +53,7 @@ class BaseDRM(TestDRM):
                 expected = self.checksums[format]
             self.console_run('drmtest -a -s 10 -m 640x480 -f %s' % format)
             self.console_wait('---ok---', '---root---', 
-                              'drm format error (%s)' % format)
+                              'drm format (%s)' % format)
             self.screen_dump(vga, "format-%s" % format, expected)
             self.console_wait('---root---')
             fcount += 1;
@@ -67,7 +67,7 @@ class BaseDRM(TestDRM):
                 continue
             self.console_run('drmtest -a -s 10 -m %s' % mode)
             self.console_wait('---ok---', '---root---', 
-                              'drm mode error (%s)' % mode)
+                              'drm mode (%s)' % mode)
             self.screen_dump(vga, "mode-%s" % mode)
             self.console_wait('---root---')
             mcount += 1;
@@ -80,7 +80,7 @@ class BaseDRM(TestDRM):
         self.write_text(vga, "fbinfo", fbinfo)
 
         self.console_run('fbtest -a -s 10')
-        self.console_wait('---ok---', '---root---', 'fbtest error')
+        self.console_wait('---ok---', '---root---', 'fbtest')
         self.screen_dump(vga, 'fbdev')
         self.console_wait('---root---')
 
@@ -90,7 +90,7 @@ class BaseDRM(TestDRM):
         self.write_text(vga, "virtcaps", virtcaps)
 
         self.console_run('virtiotest -a -s 10')
-        self.console_wait('---ok---', '---root---', 'virtiotest error')
+        self.console_wait('---ok---', '---root---', 'virtiotest')
         self.screen_dump(vga, 'virtio')
         self.console_wait('---root---')
 
@@ -109,6 +109,10 @@ class BaseDRM(TestDRM):
         vga = 'VGA'
         self.common_tests(vga)
 
+    def test_bochs_dpy(self):
+        vga = 'bochs-display'
+        self.common_tests(vga)
+
     def test_cirrus(self):
         vga = 'cirrus-vga'
         self.common_tests(vga)
diff --git a/tests/edid.py b/tests/edid.py
index 2a22f3c..f41ac82 100644
--- a/tests/edid.py
+++ b/tests/edid.py
@@ -22,13 +22,12 @@ class EDID(TestDRM):
 
     def run_edid_test(self, vga):
 
-        self.boot_gfx_vm(vga);
+        self.boot_gfx_vm("%s,edid=on" % vga);
         self.console_prepare();
 
         self.console_run('edid-decode /sys/class/drm/card0-Virtual-1/edid')
         edid = self.console_wait('---root---')
-        vganame = vga.split(",")[0];
-        self.write_text(vganame, "edid", edid)
+        self.write_text(vga, "edid", edid)
         if edid.find("QEMU Monitor") < 0:
             self.fail("edid not valid")
 
@@ -40,10 +39,17 @@ class EDID(TestDRM):
             self.prepare_kernel_initrd()
 
     def test_stdvga(self):
-        self.run_edid_test('VGA,edid=on')
+        vga = "VGA"
+        self.run_edid_test(vga)
+
+    def test_bochs_dpy(self):
+        vga = 'bochs-display'
+        self.run_edid_test(vga)
 
     def test_virtio_vga(self):
-        self.run_edid_test('virtio-vga,edid=on')
+        vga = 'virtio-vga'
+        self.run_edid_test(vga)
 
     def test_virtio_gpu(self):
-        self.run_edid_test('virtio-gpu-pci,edid=on')
+        vga = 'virtio-gpu-pci'
+        self.run_edid_test(vga)