Skip to contentSkip to conversation

tests/vm: minor install tweaks, update netbsd & freebsd

PATCH In review Gerd Hoffmann 4 participants 15 messages Mar 10, 2020 – Mar 19, 2020

lore
Share & tools
lore
#0 lore raw

cover tests/vm: minor install tweaks, update netbsd & freebsd

Gerd Hoffmann (4):
tests/vm: write raw console log
tests/vm: move vga setup
tests/vm: update FreeBSD to 12.1
tests/vm: update NetBSD to 9.0

 tests/vm/basevm.py   |  7 ++++++-
 tests/vm/fedora      |  1 +
 tests/vm/freebsd     |  5 +++--
 tests/vm/netbsd      | 24 +++++++-----------------
 tests/vm/openbsd     |  1 +
 tests/vm/ubuntu.i386 |  5 ++++-
 6 files changed, 22 insertions(+), 21 deletions(-)
Signature · 1 line
2.18.2
#1 lore raw

PATCH 1/4 tests/vm: write raw console log

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

---
 tests/vm/basevm.py | 6 ++++++
 1 file changed, 6 insertions(+)
tests/vm/basevm.py +6 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
     def console_init(self, timeout = 120):
         vm = self._guest
         vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
 
     def console_log(self, text):
         for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
         while True:
             try:
                 chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
             except socket.timeout:
                 sys.stderr.write("console: *** read timeout ***\n")
                 sys.stderr.write("console: waiting for: '%s'\n" % expect)
Signature · 1 line
2.18.2
Reviewed-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] tests/vm: write raw console log

Hi Gerd,

Quoted 2 lines · Gerd Hoffmann

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

Better to document that in the code/documentation rather than this commit description. Can you send a patch Alex can squash in?

Quoted 31 lines
---
  tests/vm/basevm.py | 6 ++++++
  1 file changed, 6 insertions(+)
tests/vm/basevm.py +6 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
      def console_init(self, timeout = 120):
          vm = self._guest
          vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
 
      def console_log(self, text):
          for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
          while True:
              try:
                  chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
              except socket.timeout:
                  sys.stderr.write("console: *** read timeout ***\n")
                  sys.stderr.write("console: waiting for: '%s'\n" % expect)
#3 lore raw

Re: [PATCH 1/4] tests/vm: write raw console log

In reply to Gerd Hoffmann
Quoted 4 lines · Gerd Hoffmann

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

I suspect this is what's breaking "make check-acceptance" so I've dropped the series from testing/next for now.

  2020-03-11 12:12:30,546 stacktrace       L0039 ERROR|
  2020-03-11 12:12:30,546 stacktrace       L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\
  ore/test.py:860
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| Traceback (most recent call last):
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
  1456, in test
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     self.error(self.exception)
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
  1064, in error
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     raise exceptions.TestError(message)
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last):
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 235, in load_module
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     return load_source(name, filename, file)
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 172, in load_source
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     module = _load(spec)
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 684, in _load
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap_external>", line 678, in exec_module
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module>
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from avocado_qemu import Test
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module>
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.machine import QEMUMachine
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\
  e 27, in <module>
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.console_socket import ConsoleSocket
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket'
  2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|
  2020-03-11 12:12:30,547 stacktrace       L0046 ERROR|
  2020-03-11 12:12:30,548 test             L0865 DEBUG| Local variables:
  2020-03-11 12:12:30,561 test             L0868 DEBUG|  -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\
  t_mips_malta_i6400_framebuffer_logo_1core
Quoted 28 lines
---
 tests/vm/basevm.py | 6 ++++++
 1 file changed, 6 insertions(+)
tests/vm/basevm.py +6 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
     def console_init(self, timeout = 120):
         vm = self._guest
         vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
 
     def console_log(self, text):
         for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
         while True:
             try:
                 chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
             except socket.timeout:
                 sys.stderr.write("console: *** read timeout ***\n")
                 sys.stderr.write("console: waiting for: '%s'\n" % expect)
Signature · 1 line
Alex Bennée
#4 lore raw

Re: [PATCH 1/4] tests/vm: write raw console log

Quoted 30 lines · Alex Bennée
Quoted 4 lines · Gerd Hoffmann

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

I suspect this is what's breaking "make check-acceptance" so I've dropped the series from testing/next for now.

   2020-03-11 12:12:30,546 stacktrace       L0039 ERROR|
   2020-03-11 12:12:30,546 stacktrace       L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\
   ore/test.py:860
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1456, in test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     self.error(self.exception)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1064, in error
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     raise exceptions.TestError(message)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 235, in load_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     return load_source(name, filename, file)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 172, in load_source
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     module = _load(spec)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 684, in _load
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap_external>", line 678, in exec_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
Quoted 8 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from avocado_qemu import Test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.machine import QEMUMachine
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\
   e 27, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.console_socket import ConsoleSocket
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket'

Cc'ing Wainer/Cleber in case...

Quoted 37 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|
   2020-03-11 12:12:30,547 stacktrace       L0046 ERROR|
   2020-03-11 12:12:30,548 test             L0865 DEBUG| Local variables:
   2020-03-11 12:12:30,561 test             L0868 DEBUG|  -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\
   t_mips_malta_i6400_framebuffer_logo_1core
Quoted 28 lines
---
  tests/vm/basevm.py | 6 ++++++
  1 file changed, 6 insertions(+)
tests/vm/basevm.py +6 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
      def console_init(self, timeout = 120):
          vm = self._guest
          vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
 
      def console_log(self, text):
          for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
          while True:
              try:
                  chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
              except socket.timeout:
                  sys.stderr.write("console: *** read timeout ***\n")
                  sys.stderr.write("console: waiting for: '%s'\n" % expect)
#5 lore raw

Re: [PATCH 1/4] tests/vm: write raw console log

Quoted 40 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Alex Bennée
Quoted 4 lines · Gerd Hoffmann

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

I suspect this is what's breaking "make check-acceptance" so I've dropped the series from testing/next for now.

   2020-03-11 12:12:30,546 stacktrace       L0039 ERROR|
   2020-03-11 12:12:30,546 stacktrace       L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\
   ore/test.py:860
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1456, in test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     self.error(self.exception)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1064, in error
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     raise exceptions.TestError(message)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 235, in load_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     return load_source(name, filename, file)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 172, in load_source
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     module = _load(spec)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 684, in _load
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap_external>", line 678, in exec_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
Quoted 8 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from avocado_qemu import Test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.machine import QEMUMachine
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\
   e 27, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.console_socket import ConsoleSocket
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket'
Quoted 2 lines

Cc'ing Wainer/Cleber in case...

I've applied the "[PATCH v4 00/10] tests/vm: Add support for aarch64 VMs" series and this patch (on top of d649689a8) and could not replicate this issue with "make check-acceptance".

Maybe I'm missing some other patch?

- Cleber.

Quoted 37 lines
Quoted 36 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|
   2020-03-11 12:12:30,547 stacktrace       L0046 ERROR|
   2020-03-11 12:12:30,548 test             L0865 DEBUG| Local variables:
   2020-03-11 12:12:30,561 test             L0868 DEBUG|  -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\
   t_mips_malta_i6400_framebuffer_logo_1core
Quoted 27 lines
---
  tests/vm/basevm.py | 6 ++++++
  1 file changed, 6 insertions(+)
tests/vm/basevm.py +6 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
      def console_init(self, timeout = 120):
          vm = self._guest
          vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
      def console_log(self, text):
          for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
          while True:
              try:
                  chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
              except socket.timeout:
                  sys.stderr.write("console: *** read timeout ***\n")
                  sys.stderr.write("console: waiting for: '%s'\n" % expect)
#6 lore raw

Re: [PATCH 1/4] tests/vm: write raw console log

Quoted 78 lines · Cleber Rosa
Quoted 40 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Alex Bennée
Quoted 4 lines · Gerd Hoffmann

Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console.

I suspect this is what's breaking "make check-acceptance" so I've dropped the series from testing/next for now.

   2020-03-11 12:12:30,546 stacktrace       L0039 ERROR|
   2020-03-11 12:12:30,546 stacktrace       L0042 ERROR| Reproduced traceback from: /home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/c\
   ore/test.py:860
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1456, in test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     self.error(self.exception)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/venv/lib/python3.6/site-packages/avocado/core/test.py", line \
   1064, in error
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     raise exceptions.TestError(message)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| avocado.core.exceptions.TestError: Traceback (most recent call last):
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 235, in load_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     return load_source(name, filename, file)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/usr/lib/python3.6/imp.py", line 172, in load_source
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     module = _load(spec)
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 684, in _load
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap_external>", line 678, in exec_module
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
Quoted 8 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/machine_mips_malta.py", line 15, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from avocado_qemu import Test
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/__init__.py", line 22, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.machine import QEMUMachine
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|   File "/home/alex.bennee/lsrc/qemu.git/builds/all/tests/acceptance/avocado_qemu/../../../python/qemu/machine.py", lin\
   e 27, in <module>
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|     from qemu.console_socket import ConsoleSocket
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR| ModuleNotFoundError: No module named 'qemu.console_socket'
Quoted 2 lines

Cc'ing Wainer/Cleber in case...

I've applied the "[PATCH v4 00/10] tests/vm: Add support for aarch64 VMs" series and this patch (on top of d649689a8) and could not replicate this issue with "make check-acceptance".

Maybe I'm missing some other patch?

- Cleber.

Quoted 26 lines
Quoted 26 lines
   2020-03-11 12:12:30,547 stacktrace       L0045 ERROR|
   2020-03-11 12:12:30,547 stacktrace       L0046 ERROR|
   2020-03-11 12:12:30,548 test             L0865 DEBUG| Local variables:
   2020-03-11 12:12:30,561 test             L0868 DEBUG|  -> self <class 'avocado.core.test.TestError'>: 1-./tests/acceptance/machine_mips_malta.py:MaltaMachineFramebuffer.tes\
   t_mips_malta_i6400_framebuffer_logo_1core
Quoted 19 lines
---
  tests/vm/basevm.py | 6 ++++++
  1 file changed, 6 insertions(+)
tests/vm/basevm.py +3 -0
index 8400b0e07f65..c53fd354d955 100644
@@ -213,6 +213,9 @@ class BaseVM(object):
      def console_init(self, timeout = 120):
          vm = self._guest
          vm.console_socket.settimeout(timeout)
+        self.console_raw_path = os.path.join(vm._temp_dir,
+                                             vm._name + "-console.raw")
+        self.console_raw_file = open(self.console_raw_path, 'wb')
      def console_log(self, text):
          for line in re.split("[\r\n]", text):
@@ -234,6 +237,9 @@ class BaseVM(object):
          while True:
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

tests/vm/basevm.py class BaseVM(object): · line 245

Quoted 8 lines
tests/vm/basevm.py +3 -0
              try:
                  chars = vm.console_socket.recv(1)
+                if self.console_raw_file:
+                    self.console_raw_file.write(chars)
+                    self.console_raw_file.flush()
              except socket.timeout:
                  sys.stderr.write("console: *** read timeout ***\n")
                  sys.stderr.write("console: waiting for: '%s'\n" % expect)

Apologies - it looks like I got misled although I hope you'll forgive me because it wasn't clear from the backtrace. I've re-based and bisected and it turned out to be broken by:

tests/acceptance: skip the mips_malta -smp tests on Travis

These could potentially be MTTCG failures which are exacerbated by the reduced number of cores on Travis. Additionally the 1 core test started failing while I was re-basing the series. However the error message is inconsistent on the various systems I run on.

  1 file changed, 6 insertions(+)
  tests/acceptance/machine_mips_malta.py | 6 ++++++

modified tests/acceptance/machine_mips_malta.py
@@ -91,6 +91,8 @@ class MaltaMachineFramebuffer(Test):
cv2.imwrite(debug_png, screendump_bgr)
self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)

+ # FIXME: this seems to be failing due to some sort of import error
+ @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')

       def test_mips_malta_i6400_framebuffer_logo_1core(self):
           """
           :avocado: tags=arch:mips64el
  @@ -99,6 +101,9 @@ class MaltaMachineFramebuffer(Test):
           """
           self.do_test_i6400_framebuffer_logo(1)
  +    # FIXME: There seems to be an MTTCG related bug that shows up more
  +    # on Travis due to the ease of hitting a race with less cores.
  +    @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
       def test_mips_malta_i6400_framebuffer_logo_7cores(self):
           """
           :avocado: tags=arch:mips64el
  @@ -108,6 +113,7 @@ class MaltaMachineFramebuffer(Test):
           """
           self.do_test_i6400_framebuffer_logo(7)

+ @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')

       def test_mips_malta_i6400_framebuffer_logo_8cores(self):
           """
           :avocado: tags=arch:mips64el

Which I had earlier in the patch series as it was failing on Travis. I'll trigger another Travis run and see if I can drop them.

Signature · 1 line
Alex Bennée
#7 lore raw

PATCH 2/4 tests/vm: move vga setup

In reply to Gerd Hoffmann

Move '-device VGA' from basevm.py to the guests, so they have the chance to opt out and run without display device.

---
 tests/vm/basevm.py   | 1 -
 tests/vm/fedora      | 1 +
 tests/vm/freebsd     | 1 +
 tests/vm/netbsd      | 1 +
 tests/vm/openbsd     | 1 +
 tests/vm/ubuntu.i386 | 5 ++++-
 6 files changed, 8 insertions(+), 2 deletions(-)
tests/vm/basevm.py +0 -1
index c53fd354d955..cffe7c4600ed 100644
@@ -179,7 +179,6 @@ class BaseVM(object):
 
     def boot(self, img, extra_args=[]):
         args = self._args + [
-            "-device", "VGA",
             "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img,
             "-device", "virtio-blk,drive=drive0,bootindex=0"]
         args += self._data_args + extra_args
tests/vm/fedora +1 -0
index 4843b4175e07..bd9c6cf295c1 100755
@@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM):
         self.boot(img_tmp, extra_args = [
             "-bios", "pc-bios/bios-256k.bin",
             "-machine", "graphics=off",
+            "-device", "VGA",
             "-cdrom", iso
         ])
         self.console_init(300)
tests/vm/freebsd +1 -0
index 86770878b67b..58166766d915 100755
@@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM):
         self.boot(img_tmp, extra_args = [
             "-bios", "pc-bios/bios-256k.bin",
             "-machine", "graphics=off",
+            "-device", "VGA",
             "-cdrom", iso
         ])
         self.console_init()
tests/vm/netbsd +1 -0
index 55590f460152..f3257bc245a3 100755
@@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM):
         self.boot(img_tmp, extra_args = [
             "-bios", "pc-bios/bios-256k.bin",
             "-machine", "graphics=off",
+            "-device", "VGA",
             "-cdrom", iso
         ])
         self.console_init()
tests/vm/openbsd +1 -0
index ab6abbedab57..0b705f494527 100755
@@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM):
         self.boot(img_tmp, extra_args = [
             "-bios", "pc-bios/bios-256k.bin",
             "-machine", "graphics=off",
+            "-device", "VGA",
             "-cdrom", iso
         ])
         self.console_init()
tests/vm/ubuntu.i386 +4 -1
index 3266038fbde5..157077533532 100755
@@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM):
         img_tmp = img + ".tmp"
         subprocess.check_call(["cp", "-f", cimg, img_tmp])
         self.exec_qemu_img("resize", img_tmp, "50G")
-        self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()])
+        self.boot(img_tmp, extra_args = [
+            "-device", "VGA",
+            "-cdrom", self.gen_cloud_init_iso()
+        ])
         self.wait_ssh()
         self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
         self.ssh_root_check("apt-get update")
Signature · 1 line
2.18.2
Reviewed-by on v1 2/4
#8 lore raw

Re: [PATCH 2/4] tests/vm: move vga setup

Quoted 80 lines · Gerd Hoffmann

Move '-device VGA' from basevm.py to the guests, so they have the chance to opt out and run without display device.

---
  tests/vm/basevm.py   | 1 -
  tests/vm/fedora      | 1 +
  tests/vm/freebsd     | 1 +
  tests/vm/netbsd      | 1 +
  tests/vm/openbsd     | 1 +
  tests/vm/ubuntu.i386 | 5 ++++-
  6 files changed, 8 insertions(+), 2 deletions(-)
tests/vm/basevm.py +0 -1
index c53fd354d955..cffe7c4600ed 100644
@@ -179,7 +179,6 @@ class BaseVM(object):
 
      def boot(self, img, extra_args=[]):
          args = self._args + [
-            "-device", "VGA",
              "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img,
              "-device", "virtio-blk,drive=drive0,bootindex=0"]
          args += self._data_args + extra_args
tests/vm/fedora +1 -0
index 4843b4175e07..bd9c6cf295c1 100755
@@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM):
          self.boot(img_tmp, extra_args = [
              "-bios", "pc-bios/bios-256k.bin",
              "-machine", "graphics=off",
+            "-device", "VGA",
              "-cdrom", iso
          ])
          self.console_init(300)
tests/vm/freebsd +1 -0
index 86770878b67b..58166766d915 100755
@@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM):
          self.boot(img_tmp, extra_args = [
              "-bios", "pc-bios/bios-256k.bin",
              "-machine", "graphics=off",
+            "-device", "VGA",
              "-cdrom", iso
          ])
          self.console_init()
tests/vm/netbsd +1 -0
index 55590f460152..f3257bc245a3 100755
@@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM):
          self.boot(img_tmp, extra_args = [
              "-bios", "pc-bios/bios-256k.bin",
              "-machine", "graphics=off",
+            "-device", "VGA",
              "-cdrom", iso
          ])
          self.console_init()
tests/vm/openbsd +1 -0
index ab6abbedab57..0b705f494527 100755
@@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM):
          self.boot(img_tmp, extra_args = [
              "-bios", "pc-bios/bios-256k.bin",
              "-machine", "graphics=off",
+            "-device", "VGA",
              "-cdrom", iso
          ])
          self.console_init()
tests/vm/ubuntu.i386 +0 -0
index 3266038fbde5..157077533532 100755
@@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM):
          img_tmp = img + ".tmp"

tests/vm/ubuntu.i386 class UbuntuX86VM(basevm.BaseVM): · line 45

Quoted 10 lines
tests/vm/ubuntu.i386 +4 -1
          subprocess.check_call(["cp", "-f", cimg, img_tmp])
          self.exec_qemu_img("resize", img_tmp, "50G")
-        self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()])
+        self.boot(img_tmp, extra_args = [
+            "-device", "VGA",
+            "-cdrom", self.gen_cloud_init_iso()
+        ])
          self.wait_ssh()
          self.ssh_root_check("touch /etc/cloud/cloud-init.disabled")
          self.ssh_root_check("apt-get update")
#9 lore raw

PATCH 3/4 tests/vm: update FreeBSD to 12.1

In reply to Gerd Hoffmann
---
 tests/vm/freebsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/vm/freebsd +2 -2
index 58166766d915..298967fe9cf4 100755
@@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM):
     name = "freebsd"
     arch = "x86_64"
 
-    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz"
-    csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db"
+    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
+    csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
     size = "20G"
     pkgs = [
         # build tools
Signature · 1 line
2.18.2
#10 lore raw

Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1

Quoted 10 lines · Gerd Hoffmann
---
 tests/vm/freebsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/vm/freebsd +0 -0
index 58166766d915..298967fe9cf4 100755

tests/vm/freebsd class FreeBSDVM(basevm.BaseVM): · line 31

Quoted 10 lines
tests/vm/freebsd +2 -2
@@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM):
     name = "freebsd"
     arch = "x86_64"
 
-    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz"
-    csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db"
+    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
+    csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
     size = "20G"
     pkgs = [
         # build tools

Hmm I'm seeing a failure during running which I had to manually override:

DEBUG:root:ssh_cmd: ssh -t -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=1 -p 39533 -i /home/alex.bennee/lsrc/qemu.git/builds/all/vm-test-_dqalech.tmp/id_rsa -o SendEnv=https_proxy -o SendEnv=http_proxy -o SendEnv=ftp_proxy -o SendEnv=no_proxy [email protected] pkg install -y git pkgconf bzip2 python37 bash gmake gsed flex bison gnutls jpeg-turbo png sdl2 gtk3 libxkbcommon libepoxy mesa-libs zstd

Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. Bootstrapping pkg from pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done
Installing pkg-1.12.0_1...
Newer FreeBSD version for package pkg:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1201000
- running kernel: 1200086
Ignore the mismatch and continue? [Y/n]:
Extracting pkg-1.12.0_1: 100%

Signature · 1 line
Alex Bennée
#11 lore raw

Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1

Quoted 5 lines

tests/vm/freebsd class FreeBSDVM(basevm.BaseVM): · line 28

Quoted 4 lines
tests/vm/freebsd +2 -2
-    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz"
-    csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db"
+    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
+    csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
Quoted 9 lines

Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. Bootstrapping pkg from pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done
Installing pkg-1.12.0_1...
Newer FreeBSD version for package pkg:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1201000

             ^^^^

12.1 package

Quoted 1 line

- running kernel: 1200086

                    ^^^^

12.0 running

I saw that too, but only *without* the patch. The upgrade to 12.1 fixes that.

We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen again after FreeBSD 12.2 release. Not sure whenever that can have unwanted side effects though, like packages not working properly.

Any advise from the bsd guys?

cheers,
Gerd

#12 lore raw

Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1

Quoted 15 lines · Gerd Hoffmann
Quoted 5 lines

tests/vm/freebsd class FreeBSDVM(basevm.BaseVM): · line 28

Quoted 4 lines
tests/vm/freebsd +2 -2
-    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz"
-    csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db"
+    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
+    csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
Quoted 9 lines

Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. Bootstrapping pkg from pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done
Installing pkg-1.12.0_1...
Newer FreeBSD version for package pkg:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1201000

             ^^^^
Quoted 8 lines

12.1 package

Quoted 1 line

- running kernel: 1200086

                    ^^^^

12.0 running

I saw that too, but only *without* the patch. The upgrade to 12.1 fixes that.

Hmm I wonder if the cached assets got confused? It certainly re-ran the install rather than skipping straight to running the test.

Quoted 8 lines

We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen again after FreeBSD 12.2 release. Not sure whenever that can have unwanted side effects though, like packages not working properly.

Any advise from the bsd guys?

cheers,
Gerd

Signature · 1 line
Alex Bennée
#13 lore raw

Re: [PATCH 3/4] tests/vm: update FreeBSD to 12.1

Quoted 20 lines · Alex Bennée
Quoted 18 lines · Gerd Hoffmann
Quoted 5 lines

tests/vm/freebsd class FreeBSDVM(basevm.BaseVM): · line 28

Quoted 4 lines
tests/vm/freebsd +2 -2
-    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz"
-    csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db"
+    link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz"
+    csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88"
Quoted 9 lines

Warning: Permanently added '[127.0.0.1]:39533' (ECDSA) to the list of known hosts. Bootstrapping pkg from pkg+http://pkg.FreeBSD.org/FreeBSD:12:amd64/quarterly, please wait... Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done
Installing pkg-1.12.0_1...
Newer FreeBSD version for package pkg:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1201000

             ^^^^

12.1 package

Quoted 1 line

- running kernel: 1200086

Quoted 8 lines
Quoted 5 lines
                    ^^^^

12.0 running

I saw that too, but only *without* the patch. The upgrade to 12.1 fixes that.

Hmm I wonder if the cached assets got confused? It certainly re-ran the install rather than skipping straight to running the test.

OK I'm an idiot... I hadn't correctly updated the branch on my test machine:

git fetch origin; and git checkout testing/next; and git reset --hard github/testing/next

vs

git fetch github; and git checkout testing/next; and git reset --hard github/testing/next

Quoted 9 lines
Quoted 9 lines

We might consider setting IGNORE_OSVERSION=yes, so this doesn't happen again after FreeBSD 12.2 release. Not sure whenever that can have unwanted side effects though, like packages not working properly.

Any advise from the bsd guys?

cheers,
Gerd

Signature · 1 line
Alex Bennée
#14 lore raw

PATCH 4/4 tests/vm: update NetBSD to 9.0

In reply to Gerd Hoffmann

The installer supports GPT now, so the install workflow has changed a bit. Also: run without VGA device. This works around a bug in the seabios sercon code and makes the bootloader menu show up on the serial line, so we can drop the quirk for that.

---
 tests/vm/netbsd | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)
tests/vm/netbsd +7 -18
index f3257bc245a3..b10c9d429ded 100755
@@ -22,8 +22,8 @@ class NetBSDVM(basevm.BaseVM):
     name = "netbsd"
     arch = "x86_64"
 
-    link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8.1-amd64.iso"
-    csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f"
+    link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/images/NetBSD-9.0-amd64.iso"
+    csum = "34da4882ee61bdbf69f241195a8933dc800949d30b43fc6988da853d57fc2b8cac50cf97a0d2adaf93250b4e329d189c1a8b83c33bd515226f37745d50c33369"
     size = "20G"
     pkgs = [
         # tools
@@ -86,42 +86,31 @@ class NetBSDVM(basevm.BaseVM):
         self.boot(img_tmp, extra_args = [
             "-bios", "pc-bios/bios-256k.bin",
             "-machine", "graphics=off",
-            "-device", "VGA",
             "-cdrom", iso
         ])
         self.console_init()
-        self.console_wait("Primary Bootstrap")
-
-        # serial console boot menu output doesn't work for some
-        # reason, so we have to fly blind ...
-        for char in list("5consdev com0\n"):
-            time.sleep(0.2)
-            self.console_send(char)
-            self.console_consume()
+        self.console_wait_send("3. Drop to boot prompt", "3")
+        self.console_wait_send("> ", "consdev com0\n")
         self.console_wait_send("> ", "boot\n")
 
         self.console_wait_send("Terminal type",            "xterm\n")
         self.console_wait_send("a: Installation messages", "a\n")
-        self.console_wait_send("b: US-English",            "b\n")
         self.console_wait_send("a: Install NetBSD",        "a\n")
         self.console_wait("Shall we continue?")
         self.console_wait_send("b: Yes",                   "b\n")
 
         self.console_wait_send("a: ld0",                   "a\n")
+        self.console_wait_send("a: Guid Partition Table",  "a\n")
         self.console_wait_send("a: This is the correct",   "a\n")
-        self.console_wait_send("b: Use the entire disk",   "b\n")
-        self.console_wait("NetBSD bootcode")
-        self.console_wait_send("a: Yes",                   "a\n")
-        self.console_wait_send("b: Use existing part",     "b\n")
+        self.console_wait_send("b: Use default part",      "b\n")
         self.console_wait_send("x: Partition sizes ok",    "x\n")
-        self.console_wait_send("for your NetBSD disk",     "\n")
         self.console_wait("Shall we continue?")
         self.console_wait_send("b: Yes",                   "b\n")
 
         self.console_wait_send("b: Use serial port com0",  "b\n")
         self.console_wait_send("f: Set serial baud rate",  "f\n")
         self.console_wait_send("a: 9600",                  "a\n")
-        self.console_wait_send("x: Exit",                  "x\n")
+        self.console_wait_send("x: Continue",              "x\n")
 
         self.console_wait_send("a: Full installation",     "a\n")
         self.console_wait_send("a: CD-ROM",                "a\n")
Signature · 1 line
2.18.2