diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-03-29 07:32:25 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-03-29 07:32:25 +0100 |
| commit | 1343b69053a2141933486a22add4a9c304e9ff7e (patch) | |
| tree | b5f283f371fa31204e6477bc52020bf14e37be75 | |
| parent | 846ed4d696c904bfffbddcc7b8294f7723ceed01 (diff) | |
| download | drminfo-1343b69053a2141933486a22add4a9c304e9ff7e.tar.gz | |
factor out console_prepare
| -rw-r--r-- | tests/basic.py | 4 | ||||
| -rw-r--r-- | tests/drminfo/__init__.py | 5 | ||||
| -rw-r--r-- | tests/edid.py | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tests/basic.py b/tests/basic.py index c9948e9..96e61c2 100644 --- a/tests/basic.py +++ b/tests/basic.py @@ -21,9 +21,7 @@ class BaseDRM(TestDRM): def run_one_test(self, vga): self.boot_gfx_vm(vga); - self.console_wait('Entering emergency mode') - self.console_run('PS1=---\\\\u---\\\\n') - self.console_wait('---root---') + self.console_prepare(); self.console_run('drminfo -a') txt = self.console_wait('---root---') diff --git a/tests/drminfo/__init__.py b/tests/drminfo/__init__.py index 5acbd66..bc23701 100644 --- a/tests/drminfo/__init__.py +++ b/tests/drminfo/__init__.py @@ -95,6 +95,11 @@ class TestDRM(avocado.Test): self.lconsole = logging.getLogger('console') self.lcommand = logging.getLogger('command') + def console_prepare(self): + self.console_wait('Entering emergency mode') + self.console_run('PS1=---\\\\u---\\\\n') + self.console_wait('---root---') + def console_run(self, command): self.lcommand.debug(command) self.wconsole.write(command) diff --git a/tests/edid.py b/tests/edid.py index f1f2530..564c3bb 100644 --- a/tests/edid.py +++ b/tests/edid.py @@ -23,9 +23,7 @@ class EDID(TestDRM): def run_one_test(self, vga): self.boot_gfx_vm(vga); - self.console_wait('Entering emergency mode') - self.console_run('PS1=---\\\\u---\\\\n') - self.console_wait('---root---') + self.console_prepare(); self.console_run('edid-decode /sys/class/drm/card0-Virtual-1/edid') edid = self.console_wait('---root---') |