Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Federico Simoncelli has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 6: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Dan Kenigsberg has submitted this change and it was merged. Change subject: tests: Add tests for qcow2 comapt option when converting images .. tests: Add tests for qcow2 comapt option when converting images Since qemuimg.convert() uses utils.watchCmd instead of utils.execCmd, FakeExecCmd was modified so it can patch both functions. This patch is separate from the actual fix, to allow easy backporting of the actual fix, without backporing the testing infrastructure, which is missing in older versions. Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Relates-To: https://bugzilla.redhat.com/1139707 Signed-off-by: Nir Soffer nsof...@redhat.com Reviewed-on: http://gerrit.ovirt.org/33350 Reviewed-by: Federico Simoncelli fsimo...@redhat.com --- M tests/qemuimgTests.py 1 file changed, 83 insertions(+), 33 deletions(-) Approvals: Nir Soffer: Verified Federico Simoncelli: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 7: Build Failed http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/231/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5864/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4024/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/34/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/30/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/36/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/10/ : FAILURE -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Federico Simoncelli has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 5: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 6: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11678/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12622/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12467/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 6: Verified+1 Rebase -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has abandoned this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Abandoned Replaced with http://gerrit.ovirt.org/33350 -- To view, visit http://gerrit.ovirt.org/33305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9530a1653e73f509b4836621a8510148b72a942c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11638/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12582/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12427/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 3: Code-Review-1 Verified-1 Build Unstable http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11650/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12594/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12439/ : UNSTABLE -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 4: Update tests to check for 2 dummy files in the convert call. -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11652/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12596/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12441/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 4: Verified+1 -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 5: Rebase -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 5: Verified+1 -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 5: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11656/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12600/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12445/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has uploaded a new change for review.
Change subject: tests: Add tests for qcow2 comapt option when converting images
..
tests: Add tests for qcow2 comapt option when converting images
Since qemuimg.convert() uses utils.watchCmd instead of utils.execCmd,
FakeExecCmd was modified so it can patch both functions.
This patch is separate from the actual fix, to allow easy backporting of
the actual fix, without backporing the testing infrastructure, which is
missing in older versions.
Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d
Relates-To: https://bugzilla.redhat.com/1139707
Signed-off-by: Nir Soffer nsof...@redhat.com
---
M tests/qemuimgTests.py
1 file changed, 82 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/33350/1
diff --git a/tests/qemuimgTests.py b/tests/qemuimgTests.py
index b9b5046..73d897b 100644
--- a/tests/qemuimgTests.py
+++ b/tests/qemuimgTests.py
@@ -19,36 +19,38 @@
#
from testlib import VdsmTestCase as TestCaseBase
+import monkeypatch
from vdsm import qemuimg
from vdsm import utils
+QEMU_IMG = qemuimg._qemuimg.cmd
-class FakeExecCmd(object):
-def __init__(self, *calls):
+class FakeCmd(object):
+
+def __init__(self, module, name, *calls):
+self.patch = monkeypatch.Patch([(module, name, self)])
self.calls = list(calls)
-self.saved = None
def __call__(self, cmd, **kw):
call = self.calls.pop(0)
return call(cmd, **kw)
def __enter__(self):
-self.saved = utils.execCmd
-utils.execCmd = self
+self.patch.apply()
def __exit__(self, t=None, v=None, tb=None):
-utils.execCmd = self.saved
+self.patch.revert()
-class QemuimgTests(TestCaseBase):
+class InfoTests(TestCaseBase):
def test_parse_error(self):
def call(cmd, **kw):
out = [image: leaf.img, invalid file format line]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
self.assertRaises(qemuimg.QImgError, qemuimg.info, 'leaf.img')
def test_qemu1_no_backing_file(self):
@@ -60,7 +62,7 @@
cluster_size: 65536]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertNotIn('backingfile', info)
@@ -74,7 +76,7 @@
backing file: base.img (actual path: /tmp/base.img)]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('base.img', info['backingfile'])
@@ -90,7 +92,7 @@
lazy refcounts: false]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('qcow2', info['format'])
self.assertEquals(1073741824, info['virtualsize'])
@@ -109,48 +111,95 @@
lazy refcounts: false]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('base.img', info['backingfile'])
-class QemuimgCreateTests(TestCaseBase):
+class CreateTests(TestCaseBase):
def test_no_format(self):
-
-def create_no_format(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', 'image']
+def create(cmd, **kw):
+expected = [QEMU_IMG, 'create', 'image']
+self.assertEqual(cmd, expected)
return 0, '', ''
-with FakeExecCmd(create_no_format):
+with FakeCmd(utils, 'execCmd', create):
qemuimg.create('image')
-def test_qcow2_compat_not_supported(self):
-
-def qcow2_compat_not_supported(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', '-f', 'qcow2', '-o',
- '?', '/dev/null']
+def test_qcow2_compat_unsupported(self):
+def qcow2_compat_unsupported(cmd, **kw):
+self.check_supports_qcow2_compat(cmd, **kw)
return 0, 'Supported options:\nsize ...\n', ''
-def create_qcow2_no_compat(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', '-f', 'qcow2',
- 'image']
+def create(cmd, **kw):
+expected = [QEMU_IMG, 'create', '-f', 'qcow2', 'image']
+self.assertEqual(cmd, expected)
return 0, '', ''
-with FakeExecCmd(qcow2_compat_not_supported, create_qcow2_no_compat):
+with FakeCmd(utils, 'execCmd', qcow2_compat_unsupported, create):
qemuimg.create('image', format='qcow2')
def
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11626/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12570/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12415/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 1: Verified+1 -- To view, visit http://gerrit.ovirt.org/33350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0d19b59bf4880e20f53369c79ae34386d274915d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has uploaded a new change for review.
Change subject: tests: Add tests for qcow2 comapt option when converting images
..
tests: Add tests for qcow2 comapt option when converting images
Since qemuimg.convert() uses utils.watchCmd instead of utils.execCmd,
FakeExecCmd was modified so it can patch both functions.
Since both create and convert tests need the qcow2_compat_xxx functions,
they were moved up to a new ImageBase test class.
This patch is separate from the actual fix, to allow easy backporting of
the actual fix, without backporing the testing infrastructure, which is
missing in older versions.
Change-Id: I9530a1653e73f509b4836621a8510148b72a942c
Relates-To: https://bugzilla.redhat.com/1139707
Signed-off-by: Nir Soffer nsof...@redhat.com
---
M tests/qemuimgTests.py
1 file changed, 76 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/33305/1
diff --git a/tests/qemuimgTests.py b/tests/qemuimgTests.py
index b9b5046..8fa7d4a 100644
--- a/tests/qemuimgTests.py
+++ b/tests/qemuimgTests.py
@@ -21,11 +21,15 @@
from testlib import VdsmTestCase as TestCaseBase
from vdsm import qemuimg
from vdsm import utils
+import monkeypatch
+
+QEMU_IMG = qemuimg._qemuimg.cmd
-class FakeExecCmd(object):
+class FakeCmd(object):
-def __init__(self, *calls):
+def __init__(self, module, name, *calls):
+self.patch = monkeypatch.Patch([(module, name, self)])
self.calls = list(calls)
self.saved = None
@@ -34,21 +38,20 @@
return call(cmd, **kw)
def __enter__(self):
-self.saved = utils.execCmd
-utils.execCmd = self
+self.patch.apply()
def __exit__(self, t=None, v=None, tb=None):
-utils.execCmd = self.saved
+self.patch.revert()
-class QemuimgTests(TestCaseBase):
+class InfoTests(TestCaseBase):
def test_parse_error(self):
def call(cmd, **kw):
out = [image: leaf.img, invalid file format line]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
self.assertRaises(qemuimg.QImgError, qemuimg.info, 'leaf.img')
def test_qemu1_no_backing_file(self):
@@ -60,7 +63,7 @@
cluster_size: 65536]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertNotIn('backingfile', info)
@@ -74,7 +77,7 @@
backing file: base.img (actual path: /tmp/base.img)]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('base.img', info['backingfile'])
@@ -90,7 +93,7 @@
lazy refcounts: false]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('qcow2', info['format'])
self.assertEquals(1073741824, info['virtualsize'])
@@ -109,48 +112,84 @@
lazy refcounts: false]
return 0, out, []
-with FakeExecCmd(call):
+with FakeCmd(utils, 'execCmd', call):
info = qemuimg.info('leaf.img')
self.assertEquals('base.img', info['backingfile'])
-class QemuimgCreateTests(TestCaseBase):
+class ImageBase(TestCaseBase):
+
+def qcow2_compat_unsupported(self, cmd, **kw):
+expected = [QEMU_IMG, 'create', '-f', 'qcow2', '-o', '?', '/dev/null']
+self.assertEqual(cmd, expected)
+return 0, 'Supported options:\nsize ...\n', ''
+
+def qcow2_compat_supported(self, cmd, **kw):
+expected = [QEMU_IMG, 'create', '-f', 'qcow2', '-o', '?', '/dev/null']
+self.assertEqual(cmd, expected)
+return 0, 'Supported options:\ncompat ...\n', ''
+
+
+class CreateTests(ImageBase):
def test_no_format(self):
-
-def create_no_format(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', 'image']
+def create(cmd, **kw):
+expected = [QEMU_IMG, 'create', 'image']
+self.assertEqual(cmd, expected)
return 0, '', ''
-with FakeExecCmd(create_no_format):
+with FakeCmd(utils, 'execCmd', create):
qemuimg.create('image')
-def test_qcow2_compat_not_supported(self):
-
-def qcow2_compat_not_supported(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', '-f', 'qcow2', '-o',
- '?', '/dev/null']
-return 0, 'Supported options:\nsize ...\n', ''
-
-def create_qcow2_no_compat(cmd, **kw):
-assert cmd == [qemuimg._qemuimg.cmd, 'create', '-f', 'qcow2',
- 'image']
+def
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11617/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12560/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12405/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9530a1653e73f509b4836621a8510148b72a942c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 2: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11618/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12562/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12407/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9530a1653e73f509b4836621a8510148b72a942c Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
Nir Soffer has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 3: Verified+1 Version 2 cleaned leftover from old FakeExeCmd, and version 3 reorder imports. -- To view, visit http://gerrit.ovirt.org/33305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9530a1653e73f509b4836621a8510148b72a942c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tests: Add tests for qcow2 comapt option when converting images
oVirt Jenkins CI Server has posted comments on this change. Change subject: tests: Add tests for qcow2 comapt option when converting images .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11619/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12563/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12408/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33305 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9530a1653e73f509b4836621a8510148b72a942c Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: Adam Litke ali...@redhat.com Gerrit-Reviewer: Allon Mureinik amure...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Federico Simoncelli fsimo...@redhat.com Gerrit-Reviewer: Francesco Romani from...@redhat.com Gerrit-Reviewer: Nir Soffer nsof...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
