jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

Python (acceptance tests) queue, 2019-08-28

# gpg: Signature made Thu 29 Aug 2019 02:11:22 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:
VNC Acceptance test: simplify test names
Boot Linux Console Test: add a test for ppc64 + pseries
Acceptance tests: drop left over usage of ":avocado: enable"
tests/requirements.txt: pin paramiko version requirement
tests.acceptance.avocado_qemu: Add support for powerpc

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Peter Maydell 3483534e 40c8bb53

+26 -7
+1 -1
.travis.yml
··· 232 232 233 233 # Acceptance (Functional) tests 234 234 - env: 235 - - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu" 235 + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc64-softmmu" 236 236 - TEST_CMD="make check-acceptance" 237 237 after_failure: 238 238 - cat tests/results/latest/job.log
+3
tests/acceptance/avocado_qemu/__init__.py
··· 39 39 """ 40 40 if arch is None: 41 41 arch = os.uname()[4] 42 + # qemu binary path does not match arch for powerpc, handle it 43 + if 'ppc64le' in arch: 44 + arch = 'ppc64' 42 45 qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, 43 46 "qemu-system-%s" % arch) 44 47 if is_readable_executable_file(qemu_bin_relative_path):
+19
tests/acceptance/boot_linux_console.py
··· 354 354 self.vm.launch() 355 355 console_pattern = 'Kernel command line: %s' % kernel_command_line 356 356 self.wait_for_console_pattern(console_pattern) 357 + 358 + def test_ppc64_pseries(self): 359 + """ 360 + :avocado: tags=arch:ppc64 361 + :avocado: tags=machine:pseries 362 + """ 363 + kernel_url = ('https://download.fedoraproject.org/pub/fedora-secondary/' 364 + 'releases/29/Everything/ppc64le/os/ppc/ppc64/vmlinuz') 365 + kernel_hash = '3fe04abfc852b66653b8c3c897a59a689270bc77' 366 + kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) 367 + 368 + self.vm.set_machine('pseries') 369 + self.vm.set_console() 370 + kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0' 371 + self.vm.add_args('-kernel', kernel_path, 372 + '-append', kernel_command_line) 373 + self.vm.launch() 374 + console_pattern = 'Kernel command line: %s' % kernel_command_line 375 + self.wait_for_console_pattern(console_pattern)
-3
tests/acceptance/migration.py
··· 17 17 18 18 19 19 class Migration(Test): 20 - """ 21 - :avocado: enable 22 - """ 23 20 24 21 timeout = 10 25 22
+2 -2
tests/acceptance/vnc.py
··· 34 34 self.assertEqual(set_password_response['error']['desc'], 35 35 'Could not set password') 36 36 37 - def test_vnc_change_password_requires_a_password(self): 37 + def test_change_password_requires_a_password(self): 38 38 self.vm.add_args('-nodefaults', '-S', '-vnc', ':0') 39 39 self.vm.launch() 40 40 self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) ··· 48 48 self.assertEqual(set_password_response['error']['desc'], 49 49 'Could not set password') 50 50 51 - def test_vnc_change_password(self): 51 + def test_change_password(self): 52 52 self.vm.add_args('-nodefaults', '-S', '-vnc', ':0,password') 53 53 self.vm.launch() 54 54 self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled'])
+1 -1
tests/requirements.txt
··· 2 2 # in the tests/venv Python virtual environment. For more info, 3 3 # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 4 4 avocado-framework==68.0 5 - paramiko 5 + paramiko==2.4.2