diff mbox series

[2/2] tests: Exclude 'boot_linux.py' from fetch-acceptance rule

Message ID 20200724073524.26589-3-f4bug@amsat.org
State New
Headers show
Series None | expand

Commit Message

Philippe Mathieu-Daudé July 24, 2020, 7:35 a.m. UTC
The boot_linux.py file triggers an exception:

  $ make fetch-acceptance
  AVOCADO tests/acceptance
  Fetching assets from tests/acceptance/empty_cpu_model.py.
  Fetching assets from tests/acceptance/vnc.py.
  Fetching assets from tests/acceptance/boot_linux_console.py.
  Fetching assets from tests/acceptance/boot_linux.py.
  Traceback (most recent call last):
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/__main__.py", line 11, in <module>
      sys.exit(main.run())
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/core/app.py", line 91, in run
      return method(self.parser.config)
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/plugins/assets.py", line 291, in run
      success, fail = fetch_assets(test_file)
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/plugins/assets.py", line 200, in fetch_assets
      handler = FetchAssetHandler(test_file, klass, method)
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/plugins/assets.py", line 65, in __init__
      self.visit(self.tree)
    File "/usr/lib64/python3.7/ast.py", line 271, in visit
      return visitor(node)
    File "/usr/lib64/python3.7/ast.py", line 279, in generic_visit
      self.visit(item)
    File "/usr/lib64/python3.7/ast.py", line 271, in visit
      return visitor(node)
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/plugins/assets.py", line 139, in visit_ClassDef
      self.generic_visit(node)
    File "/usr/lib64/python3.7/ast.py", line 279, in generic_visit
      self.visit(item)
    File "/usr/lib64/python3.7/ast.py", line 271, in visit
      return visitor(node)
    File "/var/tmp/qemu-builddir/tests/venv/lib64/python3.7/site-packages/avocado/plugins/assets.py", line 171, in visit_Assign
      self.asgmts[cur_klass][cur_method][name] = node.value.s
  KeyError: 'launch_and_wait'
  make: *** [tests/Makefile.include:949: fetch-acceptance] Error 1

Exclude it for now. We will revert this commit once the script is
fixed.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 238974d8da..7c9cf7a818 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -950,7 +950,7 @@  fetch-acceptance: check-venv
             $(TESTS_VENV_DIR)/bin/python -m avocado \
             $(if $(V),--show=$(AVOCADO_SHOW)) \
             assets fetch \
-            $(wildcard tests/acceptance/*.py), \
+            $(filter-out tests/acceptance/boot_linux.py,$(wildcard tests/acceptance/*.py)), \
             "AVOCADO", "tests/acceptance")
 
 check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images