| Message ID | 20210114170304.87507-11-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests: Fix 129 and expand 297’s reach | expand |
14.01.2021 20:03, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/297 | 2 +- > tests/qemu-iotests/300 | 18 +++++++++++++++--- > 2 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 > index 1dce1d1b1c..03d8604538 100755 > --- a/tests/qemu-iotests/297 > +++ b/tests/qemu-iotests/297 > @@ -33,7 +33,7 @@ SKIP_FILES = ( > '218', '219', '222', '224', '228', '234', '235', '236', '237', '238', > '240', '242', '245', '246', '248', '255', '256', '257', '258', '260', > '262', '264', '266', '274', '277', '280', '281', '295', '296', '298', > - '299', '300', '302', '303', '304', '307', > + '299', '302', '303', '304', '307', > 'nbd-fault-injector.py', 'qcow2.py', 'qcow2_format.py', 'qed.py' > ) > > diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 > index b864a21d5e..64d388a8fa 100755 > --- a/tests/qemu-iotests/300 > +++ b/tests/qemu-iotests/300 > @@ -22,7 +22,11 @@ import os > import random > import re > from typing import Dict, List, Optional, Union > + > import iotests > + > +# Import qemu after iotests.py has amended the PYTHONPATH you mean os.path, exactly, sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) yes? > +# pylint: disable=wrong-import-order > import qemu > > BlockBitmapMapping = List[Dict[str, Union[str, List[Dict[str, str]]]]] > @@ -110,10 +114,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): > If @msg is None, check that there has not been any error. > """ > self.vm_b.shutdown() > + > + log = self.vm_b.get_log() > + assert log is not None # Loaded after shutdown > + > if msg is None: > - self.assertNotIn('qemu-system-', self.vm_b.get_log()) > + self.assertNotIn('qemu-system-', log) > else: > - self.assertIn(msg, self.vm_b.get_log()) > + self.assertIn(msg, log) > > @staticmethod > def mapping(node_name: str, node_alias: str, > @@ -445,9 +453,13 @@ class TestBlockBitmapMappingErrors(TestDirtyBitmapMigration): > > # Check for the error in the source's log > self.vm_a.shutdown() > + > + log = self.vm_a.get_log() > + assert log is not None # Loaded after shutdown > + > self.assertIn(f"Cannot migrate bitmap '{name}' on node " > f"'{self.src_node_name}': Name is longer than 255 bytes", > - self.vm_a.get_log()) > + log) > > # Expect abnormal shutdown of the destination VM because of > # the failed migration > Your new comments are the only PEP8 complains in the 300 iotest: flake8 300 300:119:31: E261 at least two spaces before inline comment 300:458:31: E261 at least two spaces before inline comment So, I'd fix them. anyway: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
On 15.01.21 12:30, Vladimir Sementsov-Ogievskiy wrote: > 14.01.2021 20:03, Max Reitz wrote: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> tests/qemu-iotests/297 | 2 +- >> tests/qemu-iotests/300 | 18 +++++++++++++++--- >> 2 files changed, 16 insertions(+), 4 deletions(-) >> >> diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 >> index 1dce1d1b1c..03d8604538 100755 >> --- a/tests/qemu-iotests/297 >> +++ b/tests/qemu-iotests/297 >> @@ -33,7 +33,7 @@ SKIP_FILES = ( >> '218', '219', '222', '224', '228', '234', '235', '236', '237', >> '238', >> '240', '242', '245', '246', '248', '255', '256', '257', '258', >> '260', >> '262', '264', '266', '274', '277', '280', '281', '295', '296', >> '298', >> - '299', '300', '302', '303', '304', '307', >> + '299', '302', '303', '304', '307', > >> 'nbd-fault-injector.py', 'qcow2.py', 'qcow2_format.py', 'qed.py' >> ) >> diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 >> index b864a21d5e..64d388a8fa 100755 >> --- a/tests/qemu-iotests/300 >> +++ b/tests/qemu-iotests/300 >> @@ -22,7 +22,11 @@ import os >> import random >> import re >> from typing import Dict, List, Optional, Union >> + >> import iotests >> + >> +# Import qemu after iotests.py has amended the PYTHONPATH > > you mean os.path, exactly, > > sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > > yes? Indeed. >> +# pylint: disable=wrong-import-order >> import qemu >> BlockBitmapMapping = List[Dict[str, Union[str, List[Dict[str, str]]]]] >> @@ -110,10 +114,14 @@ class >> TestDirtyBitmapMigration(iotests.QMPTestCase): >> If @msg is None, check that there has not been any error. >> """ >> self.vm_b.shutdown() >> + >> + log = self.vm_b.get_log() >> + assert log is not None # Loaded after shutdown >> + >> if msg is None: >> - self.assertNotIn('qemu-system-', self.vm_b.get_log()) >> + self.assertNotIn('qemu-system-', log) >> else: >> - self.assertIn(msg, self.vm_b.get_log()) >> + self.assertIn(msg, log) >> @staticmethod >> def mapping(node_name: str, node_alias: str, >> @@ -445,9 +453,13 @@ class >> TestBlockBitmapMappingErrors(TestDirtyBitmapMigration): >> # Check for the error in the source's log >> self.vm_a.shutdown() >> + >> + log = self.vm_a.get_log() >> + assert log is not None # Loaded after shutdown >> + >> self.assertIn(f"Cannot migrate bitmap '{name}' on node " >> f"'{self.src_node_name}': Name is longer than >> 255 bytes", >> - self.vm_a.get_log()) >> + log) >> # Expect abnormal shutdown of the destination VM because of >> # the failed migration >> > > Your new comments are the only PEP8 complains in the 300 iotest: > > flake8 300 > 300:119:31: E261 at least two spaces before inline comment > 300:458:31: E261 at least two spaces before inline comment > > So, I'd fix them. Haha, sure :) > anyway: > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Thanks!
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 1dce1d1b1c..03d8604538 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -33,7 +33,7 @@ SKIP_FILES = ( '218', '219', '222', '224', '228', '234', '235', '236', '237', '238', '240', '242', '245', '246', '248', '255', '256', '257', '258', '260', '262', '264', '266', '274', '277', '280', '281', '295', '296', '298', - '299', '300', '302', '303', '304', '307', + '299', '302', '303', '304', '307', 'nbd-fault-injector.py', 'qcow2.py', 'qcow2_format.py', 'qed.py' ) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index b864a21d5e..64d388a8fa 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -22,7 +22,11 @@ import os import random import re from typing import Dict, List, Optional, Union + import iotests + +# Import qemu after iotests.py has amended the PYTHONPATH +# pylint: disable=wrong-import-order import qemu BlockBitmapMapping = List[Dict[str, Union[str, List[Dict[str, str]]]]] @@ -110,10 +114,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): If @msg is None, check that there has not been any error. """ self.vm_b.shutdown() + + log = self.vm_b.get_log() + assert log is not None # Loaded after shutdown + if msg is None: - self.assertNotIn('qemu-system-', self.vm_b.get_log()) + self.assertNotIn('qemu-system-', log) else: - self.assertIn(msg, self.vm_b.get_log()) + self.assertIn(msg, log) @staticmethod def mapping(node_name: str, node_alias: str, @@ -445,9 +453,13 @@ class TestBlockBitmapMappingErrors(TestDirtyBitmapMigration): # Check for the error in the source's log self.vm_a.shutdown() + + log = self.vm_a.get_log() + assert log is not None # Loaded after shutdown + self.assertIn(f"Cannot migrate bitmap '{name}' on node " f"'{self.src_node_name}': Name is longer than 255 bytes", - self.vm_a.get_log()) + log) # Expect abnormal shutdown of the destination VM because of # the failed migration
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/297 | 2 +- tests/qemu-iotests/300 | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)