diff options
-rw-r--r-- | tests/basic.py | 17 | ||||
-rw-r--r-- | tests/edid.py | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/tests/basic.py b/tests/basic.py index 5216a05..de929d5 100644 --- a/tests/basic.py +++ b/tests/basic.py @@ -24,15 +24,15 @@ class BaseDRM(TestDRM): 'BX24' : '0ab929a5c0ccd0123c6a64fe6fdcc24f', 'RG16' : '0dcbe8573e0bf44bb7363cd22639f3b9', } + modes = [ + "800x600", + "1024x768", + "1280x800", + "1280x1024", + "1920x1080", + ] def common_tests(self, vga, display = None): - modes = [ - "800x600", - "1024x768", - "1280x800", - "1280x1024", - "1920x1080", - ] self.boot_gfx_vm(vga, display); self.console_prepare(); @@ -62,7 +62,7 @@ class BaseDRM(TestDRM): self.fail("no drm formats"); mcount = 0 - for mode in modes: + for mode in self.modes: if drminfo.find("mode: %s" % mode) < 0: continue self.console_run('drmtest -a -s 10 -m %s' % mode) @@ -100,7 +100,6 @@ class BaseDRM(TestDRM): @avocado.skipUnless(os.path.exists('/usr/bin/dracut'), "no dracut") @avocado.skipUnless(os.path.exists('/usr/bin/drminfo'), "no drminfo") - @avocado.skipUnless(os.path.exists('/usr/bin/edid-decode'), "no edid-decode") def setUp(self): TestDRM.setUp(self); if not os.path.isfile(self.initrd): diff --git a/tests/edid.py b/tests/edid.py index 10943ae..2a22f3c 100644 --- a/tests/edid.py +++ b/tests/edid.py @@ -33,7 +33,6 @@ class EDID(TestDRM): self.fail("edid not valid") @avocado.skipUnless(os.path.exists('/usr/bin/dracut'), "no dracut") - @avocado.skipUnless(os.path.exists('/usr/bin/drminfo'), "no drminfo") @avocado.skipUnless(os.path.exists('/usr/bin/edid-decode'), "no edid-decode") def setUp(self): TestDRM.setUp(self); |