| Message ID | 20191111160216.197086-23-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: Fix check_to_replace_node() | expand |
11.11.2019 19:02, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/041 | 46 ++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/041.out | 4 ++-- > 2 files changed, 48 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 > index ab0cb5b42f..9a00cf6f7b 100755 > --- a/tests/qemu-iotests/041 > +++ b/tests/qemu-iotests/041 > @@ -1200,6 +1200,52 @@ class TestOrphanedSource(iotests.QMPTestCase): > self.assertFalse('mirror-filter' in nodes, > 'Mirror filter node did not disappear') > > +# Test cases for @replaces that do not necessarily involve Quorum > +class TestReplaces(iotests.QMPTestCase): > + # Each of these test cases needs their own block graph, so do not > + # create any nodes here > + def setUp(self): > + self.vm = iotests.VM() > + self.vm.launch() > + > + def tearDown(self): > + self.vm.shutdown() > + for img in (test_img, target_img): > + try: > + os.remove(img) > + except OSError: > + pass > + > + """ > + Check that we can replace filter nodes. > + """ PEP8 says, that doc string should appear after "def" line. (this applies to previous patch too) > + @iotests.skip_if_unsupported(['copy-on-read']) > + def test_replace_filter(self): > + result = self.vm.qmp('blockdev-add', **{ > + 'driver': 'copy-on-read', > + 'node-name': 'filter0', > + 'file': { > + 'driver': 'copy-on-read', > + 'node-name': 'filter1', > + 'file': { > + 'driver': 'null-co' > + } > + } > + }) > + self.assert_qmp(result, 'return', {}) > + > + result = self.vm.qmp('blockdev-add', > + node_name='target', driver='null-co') > + self.assert_qmp(result, 'return', {}) > + > + result = self.vm.qmp('blockdev-mirror', job_id='mirror', device='filter0', > + target='target', sync='full', replaces='filter1') > + self.assert_qmp(result, 'return', {}) > + > + self.complete_and_wait('mirror') > + > + self.vm.assert_block_path('filter0', '/file', 'target') > + > if __name__ == '__main__': > iotests.main(supported_fmts=['qcow2', 'qed'], > supported_protocols=['file']) > diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out > index ffc779b4d1..877b76fd31 100644 > --- a/tests/qemu-iotests/041.out > +++ b/tests/qemu-iotests/041.out > @@ -1,5 +1,5 @@ > -............................................................................................. > +.............................................................................................. > ---------------------------------------------------------------------- > -Ran 93 tests > +Ran 94 tests > > OK > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
On 03.12.19 16:58, Vladimir Sementsov-Ogievskiy wrote: > 11.11.2019 19:02, Max Reitz wrote: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> tests/qemu-iotests/041 | 46 ++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/041.out | 4 ++-- >> 2 files changed, 48 insertions(+), 2 deletions(-) >> >> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 >> index ab0cb5b42f..9a00cf6f7b 100755 >> --- a/tests/qemu-iotests/041 >> +++ b/tests/qemu-iotests/041 >> @@ -1200,6 +1200,52 @@ class TestOrphanedSource(iotests.QMPTestCase): >> self.assertFalse('mirror-filter' in nodes, >> 'Mirror filter node did not disappear') >> >> +# Test cases for @replaces that do not necessarily involve Quorum >> +class TestReplaces(iotests.QMPTestCase): >> + # Each of these test cases needs their own block graph, so do not >> + # create any nodes here >> + def setUp(self): >> + self.vm = iotests.VM() >> + self.vm.launch() >> + >> + def tearDown(self): >> + self.vm.shutdown() >> + for img in (test_img, target_img): >> + try: >> + os.remove(img) >> + except OSError: >> + pass >> + >> + """ >> + Check that we can replace filter nodes. >> + """ > > PEP8 says, that doc string should appear after "def" line. > (this applies to previous patch too) OK. I just noticed that in some previous patch I also left them having single quotes, which I should fix. Max
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index ab0cb5b42f..9a00cf6f7b 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -1200,6 +1200,52 @@ class TestOrphanedSource(iotests.QMPTestCase): self.assertFalse('mirror-filter' in nodes, 'Mirror filter node did not disappear') +# Test cases for @replaces that do not necessarily involve Quorum +class TestReplaces(iotests.QMPTestCase): + # Each of these test cases needs their own block graph, so do not + # create any nodes here + def setUp(self): + self.vm = iotests.VM() + self.vm.launch() + + def tearDown(self): + self.vm.shutdown() + for img in (test_img, target_img): + try: + os.remove(img) + except OSError: + pass + + """ + Check that we can replace filter nodes. + """ + @iotests.skip_if_unsupported(['copy-on-read']) + def test_replace_filter(self): + result = self.vm.qmp('blockdev-add', **{ + 'driver': 'copy-on-read', + 'node-name': 'filter0', + 'file': { + 'driver': 'copy-on-read', + 'node-name': 'filter1', + 'file': { + 'driver': 'null-co' + } + } + }) + self.assert_qmp(result, 'return', {}) + + result = self.vm.qmp('blockdev-add', + node_name='target', driver='null-co') + self.assert_qmp(result, 'return', {}) + + result = self.vm.qmp('blockdev-mirror', job_id='mirror', device='filter0', + target='target', sync='full', replaces='filter1') + self.assert_qmp(result, 'return', {}) + + self.complete_and_wait('mirror') + + self.vm.assert_block_path('filter0', '/file', 'target') + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2', 'qed'], supported_protocols=['file']) diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out index ffc779b4d1..877b76fd31 100644 --- a/tests/qemu-iotests/041.out +++ b/tests/qemu-iotests/041.out @@ -1,5 +1,5 @@ -............................................................................................. +.............................................................................................. ---------------------------------------------------------------------- -Ran 93 tests +Ran 94 tests OK
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/041 | 46 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/041.out | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-)