aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-04-01 10:35:55 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-04-01 10:35:55 +0200
commit92cc2b0b00ccd6748a4153ac0f8f693e68375e1c (patch)
tree892530cf768dbda11559c3eb36cf8294c175cf1e
parentd9145185c9c34231d06fdd60b69288dcd0684eab (diff)
downloaddrminfo-92cc2b0b00ccd6748a4153ac0f8f693e68375e1c.tar.gz
add timeouts
-rw-r--r--tests/basic.py2
-rw-r--r--tests/edid.py2
-rw-r--r--tests/unload.py4
3 files changed, 7 insertions, 1 deletions
diff --git a/tests/basic.py b/tests/basic.py
index 006cd79..9999c3a 100644
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -18,6 +18,8 @@ class BaseDRM(TestDRM):
:avocado: tags=x86_64
"""
+ timeout = 60
+
checksums = {
'AR24' : 'adf315fe78e8f7e2947d65158545b4d3',
'XR24' : '661a70b8dca5436443ce09014e6c326c',
diff --git a/tests/edid.py b/tests/edid.py
index 4a9e725..6a21bf7 100644
--- a/tests/edid.py
+++ b/tests/edid.py
@@ -20,6 +20,8 @@ class EDID(TestDRM):
:avocado: tags=x86_64
"""
+ timeout = 60
+
def run_edid_test(self, vga):
self.boot_gfx_vm("%s,edid=on" % vga);
diff --git a/tests/unload.py b/tests/unload.py
index d31837e..5e36506 100644
--- a/tests/unload.py
+++ b/tests/unload.py
@@ -20,6 +20,8 @@ class unload(TestDRM):
:avocado: tags=x86_64
"""
+ timeout = 60
+
def run_unload_test(self, vga, module):
self.boot_gfx_vm(vga);
@@ -28,7 +30,7 @@ class unload(TestDRM):
self.console_run('for vt in /sys/class/vtconsole/vtcon*; do echo 0 > $vt/bind; done')
self.console_wait('---root---')
self.console_run('rmmod %s' % module)
- self.console_wait('---root---', 'ERROR', 'rmmod')
+ self.console_wait('---root---', 'rmmod: ERROR: ', 'rmmod')
@avocado.skipUnless(os.path.exists('/usr/bin/dracut'), "no dracut")
def setUp(self):