Maor Lipchuk has uploaded a new change for review.
Change subject: qemuimg_test: make test pass.
......................................................................
qemuimg_test: make test pass.
There are few failures in the qemuimg test
which makes it consistently fail.
This patch should fix those.
Change-Id: I623cb3c0e3de3e020fdb2493dd466e8bef4e7b66
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M tests/qemuimg_test.py
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/64371/1
diff --git a/tests/qemuimg_test.py b/tests/qemuimg_test.py
index e72c832..c3ba4a6 100644
--- a/tests/qemuimg_test.py
+++ b/tests/qemuimg_test.py
@@ -27,7 +27,7 @@
from testlib import permutations, expandPermutations
from testlib import make_config
from testlib import namedTemporaryDir
-from vdsm.common import exception
+from vdsm import exception
from vdsm import qemuimg
from vdsm import commands
@@ -237,7 +237,7 @@
def convert(cmd, **kw):
expected = [QEMU_IMG, 'convert', '-p', '-t', 'none', '-T', 'none',
'src', '-O', 'qcow2', '-o',
- 'compat=0.10,backing_file=bak', 'dst']
+ 'compat=0.10', '-o', 'backing_file=bak', 'dst']
self.assertEqual(cmd, expected)
with MonkeyPatchScope([(qemuimg, 'config', CONFIG),
@@ -259,9 +259,9 @@
def test_qcow2_backing_file_and_format(self):
def convert(cmd, **kw):
expected = [QEMU_IMG, 'convert', '-p', '-t', 'none', '-T', 'none',
- 'src', '-O', 'qcow2', '-o',
- 'compat=0.10,backing_file=bak,backing_fmt=qcow2',
- 'dst']
+ 'src', '-O', 'qcow2', '-o', 'compat=0.10', '-o',
+ 'backing_file=bak,backing_fmt=qcow2', 'dst']
+
self.assertEqual(cmd, expected)
with MonkeyPatchScope([(qemuimg, 'config', CONFIG),
--
To view, visit https://gerrit.ovirt.org/64371
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I623cb3c0e3de3e020fdb2493dd466e8bef4e7b66
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
