diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acceptance/cpu_queries.py | 3 | ||||
| -rw-r--r-- | tests/acceptance/linux_ssh_mips_malta.py | 10 | ||||
| -rw-r--r-- | tests/libqtest.c | 2 | ||||
| -rw-r--r-- | tests/migration/guestperf/engine.py | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/172 | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/tests/acceptance/cpu_queries.py b/tests/acceptance/cpu_queries.py index e71edec39f..af47d2795a 100644 --- a/tests/acceptance/cpu_queries.py +++ b/tests/acceptance/cpu_queries.py @@ -18,6 +18,9 @@ class QueryCPUModelExpansion(Test): """ def test(self): + """ + :avocado: tags=arch:x86_64 + """ self.vm.set_machine('none') self.vm.add_args('-S') self.vm.launch() diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index 134f10cac3..7200507a3a 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -12,7 +12,7 @@ import logging import paramiko import time -from avocado import skipIf +from avocado import skipUnless from avocado_qemu import Test from avocado.utils import process from avocado.utils import archive @@ -171,7 +171,7 @@ class LinuxSSH(Test): self.run_common_commands() self.shutdown_via_ssh() - @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_mips_malta32eb_kernel3_2_0(self): """ :avocado: tags=arch:mips @@ -186,7 +186,7 @@ class LinuxSSH(Test): self.check_mips_malta('be', kernel_path, 'mips') - @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_mips_malta32el_kernel3_2_0(self): """ :avocado: tags=arch:mipsel @@ -201,7 +201,7 @@ class LinuxSSH(Test): self.check_mips_malta('le', kernel_path, 'mips') - @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_mips_malta64eb_kernel3_2_0(self): """ :avocado: tags=arch:mips64 @@ -215,7 +215,7 @@ class LinuxSSH(Test): kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) self.check_mips_malta('be', kernel_path, 'mips64') - @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_mips_malta64el_kernel3_2_0(self): """ :avocado: tags=arch:mips64el diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a7556462d..38e4f5b587 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -241,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) "-qtest-log %s " "-chardev socket,path=%s,id=char0 " "-mon chardev=char0,mode=control " - "-machine accel=qtest " + "-accel qtest " "-display none " "%s", qemu_binary, socket_path, getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index f13dbea800..1dd04ce33b 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -287,7 +287,7 @@ class Engine(object): cmdline = "'" + cmdline + "'" argv = [ - "-machine", "accel=kvm", + "-accel", "kvm", "-cpu", "host", "-kernel", self._kernel, "-initrd", self._initrd, diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index ba7dad9057..d67997e5f6 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -55,7 +55,7 @@ do_run_qemu() done fi echo quit - ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" + ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@" echo } |