[v6,7/7,RFC] : use Avocado data drainer for console logging
diff mbox series

Message ID 20190606211414.8681-8-crosa@redhat.com
State New
Headers show
Series
  • Add "boot_linux" acceptance test
Related show

Commit Message

Cleber Rosa June 6, 2019, 9:14 p.m. UTC
This depends on a proposed feature to Avocado, a new module that
"drains" data and processes it.  In this case, a drainer for the
console socket file descriptor is used, and the data is sent to the
"console" logger.

This allows for a much better feedback of the test process, showing
boot data from the guest as it happens, without obstructing the test
code path.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 tests/acceptance/boot_linux.py | 14 +++++++++++---
 tests/requirements.txt         |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

Patch
diff mbox series

diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py
index 9b54a0241f..f3507f519e 100644
--- a/tests/acceptance/boot_linux.py
+++ b/tests/acceptance/boot_linux.py
@@ -15,6 +15,7 @@  from avocado_qemu import Test, SRC_ROOT_DIR
 from avocado.utils import cloudinit
 from avocado.utils import network
 from avocado.utils import vmimage
+from avocado.utils import datadrainer
 
 
 class BootLinux(Test):
@@ -55,6 +56,13 @@  class BootLinux(Test):
                       phone_home_port=self.phone_home_port)
         self.vm.add_args('-drive', 'file=%s,format=raw' % cloudinit_iso)
 
+    def launch(self):
+        self.vm.set_console()
+        self.vm.launch()
+        console_drainer = datadrainer.LineLogger(self.vm.console_socket.fileno(),
+                                                 logger=self.log.getChild('console'))
+        console_drainer.start()
+
     def wait_for_boot_confirmation(self):
         self.log.info('VM launched, waiting for boot confirmation from guest')
         cloudinit.wait_for_phone_home(('0.0.0.0', self.phone_home_port), self.name)
@@ -70,7 +78,7 @@  class BootLinuxX8664(BootLinux):
         :avocado: tags=machine:pc
         """
         self.vm.set_machine('pc')
-        self.vm.launch()
+        self.launch()
         self.wait_for_boot_confirmation()
 
     def test_q35(self):
@@ -79,7 +87,7 @@  class BootLinuxX8664(BootLinux):
         :avocado: tags=machine:q35
         """
         self.vm.set_machine('q35')
-        self.vm.launch()
+        self.launch()
         self.wait_for_boot_confirmation()
 
 
@@ -99,5 +107,5 @@  class BootLinuxAarch64(BootLinux):
                                       'edk2-aarch64-code.fd'))
         self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
         self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
-        self.vm.launch()
+        self.launch()
         self.wait_for_boot_confirmation()
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 9d2c79b146..28eaf7b61e 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,7 +1,7 @@ 
 # Add Python module requirements, one per line, to be installed
 # in the tests/venv Python virtual environment. For more info,
 # refer to: https://pip.pypa.io/en/stable/user_guide/#id1
-avocado-framework==68.0
+-e git+https://github.com/clebergnu/avocado@datadrainer#egg=avocado_framework
 paramiko
 pycdlib==1.6.0