Received: from eggs.gnu.org ([2001:4830:134:3::10]:45076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCCkU-0005Cu-DI for qemu-devel@nongnu.org; Mon, 15 Oct 2018 19:58:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCCkS-00021h-Cf for qemu-devel@nongnu.org; Mon, 15 Oct 2018 19:58:10 -0400 Date: Mon, 15 Oct 2018 20:57:52 -0300 From: Eduardo Habkost Message-ID: <20181015235752.GK31060@habkost.net> References: <20181015141453.32632-1-mreitz@redhat.com> <20181015141453.32632-8-mreitz@redhat.com> <14120cdc-1517-f9af-9f35-3c78b4f634a9@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14120cdc-1517-f9af-9f35-3c78b4f634a9@redhat.com> Subject: Re: [Qemu-devel] [PATCH 7/9] iotests: 'new' module replacement in 169 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cleber Rosa Cc: Max Reitz , qemu-block@nongnu.org, qemu-devel@nongnu.org, Kevin Wolf On Mon, Oct 15, 2018 at 07:38:45PM -0400, Cleber Rosa wrote: > > > On 10/15/18 10:14 AM, Max Reitz wrote: > > iotest 169 uses the 'new' module to add methods to a class. This module > > no longer exists in Python 3. Instead, we can use a lambda. Best of > > all, this works in 2.7 just as well. > > > > Signed-off-by: Max Reitz > > --- > > tests/qemu-iotests/169 | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 > > index f243db9955..e5614b159d 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 > > from iotests import qemu_img > > > > > > @@ -144,7 +143,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): > > > > def inject_test_case(klass, name, method, *args, **kwargs): > > mc = operator.methodcaller(method, *args, **kwargs) > > - setattr(klass, 'test_' + name, new.instancemethod(mc, None, klass)) > > + setattr(klass, 'test_' + name, lambda self: mc(self)) > > > > for cmb in list(itertools.product((True, False), repeat=4)): > > name = ('_' if cmb[0] else '_not_') + 'persistent_' > > > > This can be simplified with: > > diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 > index e5614b159d..2199f14ae7 100755 > --- a/tests/qemu-iotests/169 > +++ b/tests/qemu-iotests/169 > @@ -22,7 +22,6 @@ import os > import iotests > import time > import itertools > -import operator > from iotests import qemu_img > > > @@ -141,18 +140,15 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): > self.check_bitmap(self.vm_b, sha256 if persistent else False) > > > -def inject_test_case(klass, name, method, *args, **kwargs): > - mc = operator.methodcaller(method, *args, **kwargs) > - setattr(klass, 'test_' + name, lambda self: mc(self)) > - > for cmb in list(itertools.product((True, False), repeat=4)): > name = ('_' if cmb[0] else '_not_') + 'persistent_' > name += ('_' if cmb[1] else '_not_') + 'migbitmap_' > name += '_online' if cmb[2] else '_offline' > name += '_shared' if cmb[3] else '_nonshared' > > - inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration', > - *list(cmb)) > + setattr(TestDirtyBitmapMigration, 'test_' + name, > + lambda self: TestDirtyBitmapMigration.do_test_migration( > + self, *list(cmb))) I'm not fond of the long multi-line lambda expression, but I love that you got rid of operator.methodcaller(). :) However, this doesn't seem to work: `*list(cmb)` will be evaluated only when the lambda is called, and `cmb` will be always `(False, False, False, False)`. I was going to suggest defining a nested function inside inject_test_case() to replace operator.methodcaller(), but then I thought it was not worth it. -- Eduardo