diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 13:24:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 13:24:51 +0000 |
| commit | 8ebf8ea90ecbbb2ef743dccfbfb73e2904cad1f5 (patch) | |
| tree | 56a5de883941fd7bacf6c485225bedcbad5450f9 /tests/qemu-iotests/169 | |
| parent | 8002fa2bf6d3eddc0b73f8a0b64ac6b3ad1defab (diff) | |
| parent | e301e65c97142c4d2a2adf35f5a4fa73d65d8a4f (diff) | |
| download | focaccia-qemu-8ebf8ea90ecbbb2ef743dccfbfb73e2904cad1f5.tar.gz focaccia-qemu-8ebf8ea90ecbbb2ef743dccfbfb73e2904cad1f5.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2018-10-30 * Makefile rule for running acceptance tests (make check-acceptance) (Cleber Rosa) * Make iotests compatible with Python 3 (Max Reitz) * device-crash-test whitelist update (Thomas Huth) * Misc cleanups (Cleber Rosa) # gpg: Signature made Wed 31 Oct 2018 00:28:39 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: scripts/qemu.py: use a more consistent docstring style scripts/decodetree.py: fix reference to attributes Travis support for the acceptance tests Acceptance tests: add make rule for running them Bootstrap Python venv for tests iotests: Unify log outputs between Python 2 and 3 iotests: Modify imports for Python 3 iotests: 'new' module replacement in 169 iotests: Explicitly bequeath FDs in Python iotests: Different iterator behavior in Python 3 iotests: Use // for Python integer division iotests: Use Python byte strings where appropriate iotests: Flush in iotests.py's QemuIoInteractive iotests: Make nbd-fault-injector flush scripts/device-crash-test: Remove devices that are not user_creatable anymore Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/169')
| -rwxr-xr-x | tests/qemu-iotests/169 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 index 69850c4c67..527aebd0cb 100755 --- a/tests/qemu-iotests/169 +++ b/tests/qemu-iotests/169 @@ -23,7 +23,6 @@ import iotests import time import itertools import operator -import new import re from iotests import qemu_img @@ -204,7 +203,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): def inject_test_case(klass, name, method, *args, **kwargs): mc = operator.methodcaller(method, *args, **kwargs) - setattr(klass, 'test_' + method + name, new.instancemethod(mc, None, klass)) + setattr(klass, 'test_' + method + name, lambda self: mc(self)) for cmb in list(itertools.product((True, False), repeat=4)): name = ('_' if cmb[0] else '_not_') + 'persistent_' |