Skip to content

tests/acceptance: Use QEMUMachine on tests that expect failure

Wainer dos Santos Moschetta qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 4 repliesIn review
  2. v12 patches 4 repliesSuperseded

Changes v2 -> v1 from the cover letter

- set_qmp_monitor() uses enabled=True instead of disabled=False (patch 01) [crosa]
- removed monitor_address parameter from set_qmp_monitor() (patch 01) [crosa]
- adjusted to use 'enabled' (patch 02) [crosa]

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2python/qemu: Add set_qmp_monitor() to QEMUMachinepython/qemu/machine.py+43 -233 replies
2/2tests/acceptance: Makes linux_initrd and empty_cpu_model use QEMUMachinetests/acceptance/empty_cpu_model.py tests/acceptance/linux_initrd.py+13 -121 reply

Reviews trailers per patch

All 2 patches have a Reviewed-by or Acked-by.

PatchCleber Rosa
1/2R-b
2/2R-b T-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/2] tests/acceptance: Use QEMUMachine on tests that expect failure

The linux_initrd and empty_cpu_model tests assert that QEMU exit with failure on certain scenarios. Currently they are not able to use QEMUMachine object due to the QMP monitor connection which is tentatively established always. Instead they handle the QEMU binary directy, but ideally they should use QEMUMachine in order to:
a) Take advantage of error handling and logging in QEMUMachine.
b) Follow the pattern in other acceptance tests.

Changes v2 -> v1:
- set_qmp_monitor() uses enabled=True instead of disabled=False (patch 01) [crosa]
- removed monitor_address parameter from set_qmp_monitor() (patch 01) [crosa]
- adjusted to use 'enabled' (patch 02) [crosa]

Changes v1 -> null:
- Patch 01 first appeared in [1]. Here I propose the same implementation but the code was rebased.
- empty_cpu_model used to check both stdout and stderr of the process. The QEMUMachine doesn't provide an interface to access the underneath process object, instead the process' output is available through get_log(). This method in turn returns the content of stdout (stderr is redirected to stdout). Therefore, I adapted the assertion statement to check the '-cpu option cannot be empty' message shows in the output.

Git:
- Tree: https://github.com/wainersm/qemu
- Branch: tests_without_qmp_v2

CI:
- Travis (PASS): https://travis-ci.org/wainersm/qemu/builds/623716505

References:
[1] https://www.mail-archive.com/[email protected]/msg627498.html

Wainer dos Santos Moschetta (2):
python/qemu: Add set_qmp_monitor() to QEMUMachine tests/acceptance: Makes linux_initrd and empty_cpu_model use
QEMUMachine

 python/qemu/machine.py              | 66 +++++++++++++++++++----------
 tests/acceptance/empty_cpu_model.py | 12 +++---
 tests/acceptance/linux_initrd.py    | 13 +++---
 3 files changed, 56 insertions(+), 35 deletions(-)
Signature · 1 line
2.21.0