izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Python (acceptance tests) queue, 2019-09-19

# gpg: Signature made Thu 19 Sep 2019 17:24:04 BST
# gpg:                using RSA key 7ABB96EB8B46B94D5E0FE9BB657E8D33A5F209F3
# gpg: Good signature from "Cleber Rosa <crosa@redhat.com>" [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:
  BootLinuxSshTest: Only run the tests when explicitly requested
  tests/acceptance: Specify arch for QueryCPUModelExpansion

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2019-09-20 17:28:43 +01:00
parent f5c7af6295 471c97a693
commit 4300b7c2cd
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/cpu_queries.py
+3
View File
@@ -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()
tests/acceptance/linux_ssh_mips_malta.py
+5 -5
View File
@@ -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