[Qemu-commits] [qemu/qemu] 9531d2: Acceptance tests: drop usage of ":avocado: enable"

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9531d26c10613348b53e1846566380be4f15b23c
      
https://github.com/qemu/qemu/commit/9531d26c10613348b53e1846566380be4f15b23c
  Author: Cleber Rosa <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M docs/devel/testing.rst
    M tests/acceptance/boot_linux_console.py
    M tests/acceptance/linux_initrd.py
    M tests/acceptance/version.py
    M tests/acceptance/virtio_version.py
    M tests/acceptance/vnc.py
    M tests/requirements.txt

  Log Message:
  -----------
  Acceptance tests: drop usage of ":avocado: enable"

The Avocado test runner attemps to find its INSTRUMENTED (that is,
Python based tests) in a manner that is as safe as possible to the
user.  Different from plain Python unittest, it won't load or
execute test code on an operation such as:

 $ avocado list tests/acceptance/

Before version 68.0, the logic implemented to identify INSTRUMENTED
tests would require either the ":avocado: enable" or ":avocado:
recursive" statement as a flag for tests that would not inherit
directly from "avocado.Test".  This is not necessary anymore,
and because of that the boiler plate statements can now be removed.

Reference: 
https://avocado-framework.readthedocs.io/en/68.0/release_notes/68_0.html#users-test-writers
Signed-off-by: Cleber Rosa <address@hidden>
Reviewed-by: Caio Carrara <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: 8f8fd9edba4bd6768da2c8e2bea49ad5c16ced1a
      
https://github.com/qemu/qemu/commit/8f8fd9edba4bd6768da2c8e2bea49ad5c16ced1a
  Author: Cleber Rosa <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M configure
    A python/qemu/__init__.py
    A python/qemu/qmp.py
    A python/qemu/qtest.py
    M scripts/device-crash-test
    R scripts/qemu.py
    R scripts/qmp/__init__.py
    M scripts/qmp/qemu-ga-client
    M scripts/qmp/qmp-shell
    R scripts/qmp/qmp.py
    R scripts/qtest.py
    M scripts/render_block_graph.py
    M tests/acceptance/avocado_qemu/__init__.py
    M tests/acceptance/virtio_version.py
    M tests/migration/guestperf/engine.py
    M tests/qemu-iotests/235
    M tests/qemu-iotests/238
    M tests/qemu-iotests/iotests.py
    M tests/vm/basevm.py

  Log Message:
  -----------
  Introduce a Python module structure

This is a simple move of Python code that wraps common QEMU
functionality, and are used by a number of different tests
and scripts.

By treating that code as a real Python module, we can more easily:
 * reuse code
 * have a proper place for the module's own unittests
 * apply a more consistent style
 * generate documentation

Signed-off-by: Cleber Rosa <address@hidden>
Reviewed-by: Caio Carrara <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: 10314fb060f2bd42c3fb0f5523edb8dbb0247d00
      
https://github.com/qemu/qemu/commit/10314fb060f2bd42c3fb0f5523edb8dbb0247d00
  Author: Cleber Rosa <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M python/qemu/__init__.py

  Log Message:
  -----------
  scripts/qemu.py: log QEMU launch command line

Even when the launch of QEMU succeeds, it's useful to have the command
line recorded.

Reviewed-by: Caio Carrara <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: b7287d428325705ddf9d9b26d3a7dc2d4ffe837f
      
https://github.com/qemu/qemu/commit/b7287d428325705ddf9d9b26d3a7dc2d4ffe837f
  Author: Caio Carrara <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M docs/devel/testing.rst
    M tests/acceptance/avocado_qemu/__init__.py

  Log Message:
  -----------
  tests.acceptance: adds multi vm capability for acceptance tests

This change adds the possibility to write acceptance tests with multi
virtual machine support. It's done keeping the virtual machines objects
stored in a test attribute (dictionary). This dictionary shouldn't be
accessed directly but through the new method added `get_vm`. This new
method accept a list of args (that will be added as virtual machine
arguments) and an optional name argument. The name is the key that
identify a single virtual machine along the test machines available. If
a name without a machine is informed a new machine will be instantiated.

The current usage of vm in tests will not be broken by this change since
it keeps a property called vm in the base test class. This property only
calls the new method `get_vm` with default parameters (no args and
'default' as machine name).

Signed-off-by: Caio Carrara <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: a7abb537654ee8e98a11ec85dbf0728c03afc3c0
      
https://github.com/qemu/qemu/commit/a7abb537654ee8e98a11ec85dbf0728c03afc3c0
  Author: Caio Carrara <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    A tests/acceptance/migration.py

  Log Message:
  -----------
  tests.acceptance: adds simple migration test

This change adds the simplest possible migration test. Beyond the test
purpose itself it's also useful to exercise the multi virtual machines
capabilities from base avocado qemu test class.

Signed-off-by: Cleber Rosa <address@hidden>
Signed-off-by: Caio Carrara <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: 3c7156fd3e289b9b5f7a6a69e4dd310b4898afc5
      
https://github.com/qemu/qemu/commit/3c7156fd3e289b9b5f7a6a69e4dd310b4898afc5
  Author: Li Zhijian <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M tests/acceptance/linux_initrd.py

  Log Message:
  -----------
  Acceptance tests: use linux-3.6 and set vm memory to 4GiB

QEMU have already supported to load up to 4G initrd if the sepcified memory is
enough and XLF_CAN_BE_LOADED_ABOVE_4G is set by guest kernel

linux-3.6 kernel shipped by Fedora-18 cannot support xldflags so that it
cannot support loading more than 2GiB initrd

CC: Wainer dos Santos Moschetta <address@hidden>
CC: Caio Carrara <address@hidden>
CC: Cleber Rosa <address@hidden>
CC: Eduardo Habkost <address@hidden>
CC: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: 8f1c89ec7443e4fa2cf106d8fa1c1c97b6ddeffb
      
https://github.com/qemu/qemu/commit/8f1c89ec7443e4fa2cf106d8fa1c1c97b6ddeffb
  Author: Li Zhijian <address@hidden>
  Date:   2019-02-22 (Fri, 22 Feb 2019)

  Changed paths:
    M tests/acceptance/linux_initrd.py

  Log Message:
  -----------
  Acceptance tests: expect boot to extract 2GiB+ initrd with linux-v4.16

XLF_CAN_BE_LOADED_ABOVE_4G is set on vmlinuz shipped by Fedora-28 so that
it's allowed to be loaded below 4 GB address.

timeout is updated to 5 minutes as well since we need more time to load a
large initrd to the guest

CC: Wainer dos Santos Moschetta <address@hidden>
CC: Caio Carrara <address@hidden>
CC: Cleber Rosa <address@hidden>
CC: Eduardo Habkost <address@hidden>
CC: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>


  Commit: 6cb4f6db4f4367faa33da85b15f75bbbd2bed2a6
      
https://github.com/qemu/qemu/commit/6cb4f6db4f4367faa33da85b15f75bbbd2bed2a6
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-07 (Thu, 07 Mar 2019)

  Changed paths:
    M configure
    M docs/devel/testing.rst
    A python/qemu/__init__.py
    A python/qemu/qmp.py
    A python/qemu/qtest.py
    M scripts/device-crash-test
    R scripts/qemu.py
    R scripts/qmp/__init__.py
    M scripts/qmp/qemu-ga-client
    M scripts/qmp/qmp-shell
    R scripts/qmp/qmp.py
    R scripts/qtest.py
    M scripts/render_block_graph.py
    M tests/acceptance/avocado_qemu/__init__.py
    M tests/acceptance/boot_linux_console.py
    M tests/acceptance/linux_initrd.py
    A tests/acceptance/migration.py
    M tests/acceptance/version.py
    M tests/acceptance/virtio_version.py
    M tests/acceptance/vnc.py
    M tests/migration/guestperf/engine.py
    M tests/qemu-iotests/235
    M tests/qemu-iotests/238
    M tests/qemu-iotests/iotests.py
    M tests/requirements.txt
    M tests/vm/basevm.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cleber/tags/python-next-pull-request' 
into staging

Python queue, 2019-02-22

Python:
* introduce "python" directory with module namespace
* log QEMU launch command line on qemu.QEMUMachine

Acceptance Tests:
* initrd 4GiB+ test
* migration test
* multi vm support in test class
* bump Avocado version and drop ":avocado: enable"

# gpg: Signature made Fri 22 Feb 2019 19:37:07 GMT
# gpg:                using RSA key 657E8D33A5F209F3
# gpg: Good signature from "Cleber Rosa <address@hidden>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 7ABB 96EB 8B46 B94D 5E0F  E9BB 657E 8D33 A5F2 09F3

* remotes/cleber/tags/python-next-pull-request:
  Acceptance tests: expect boot to extract 2GiB+ initrd with linux-v4.16
  Acceptance tests: use linux-3.6 and set vm memory to 4GiB
  tests.acceptance: adds simple migration test
  tests.acceptance: adds multi vm capability for acceptance tests
  scripts/qemu.py: log QEMU launch command line
  Introduce a Python module structure
  Acceptance tests: drop usage of ":avocado: enable"

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/21afe115a497...6cb4f6db4f43