Change in vdsm[master]: spec: only gluster requires blivet

danken at redhat.com danken at redhat.com
Sat Jan 17 21:22:50 UTC 2015


Dan Kenigsberg has uploaded a new change for review.

Change subject: spec: only gluster requires blivet
......................................................................

spec: only gluster requires blivet

commit 7e49db74d introduced a gluster-only dependecy on python-blivet.

The dependency should have been localized to vdsm-gluster, and only on
platforms that have the package. When it is not available, its relevant
test shouldbe skipped.

Change-Id: I50d1fe4cc992ab9a40101e1dbbba95c35d2ddcca
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/gluster_cli_tests.py
M vdsm.spec.in
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/37010/1

diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py
index de1257f..8ee8341 100644
--- a/tests/gluster_cli_tests.py
+++ b/tests/gluster_cli_tests.py
@@ -20,8 +20,8 @@
 
 from testlib import VdsmTestCase as TestCaseBase
 from gluster import cli as gcli
-from gluster.storagedev import _parseDevices as parseStorageDevices
 import xml.etree.cElementTree as etree
+from nose.plugins.skip import SkipTest
 import glusterTestData
 
 
@@ -1081,6 +1081,11 @@
         self.assertEquals(status, ostatus)
 
     def test_parseStorageDevices(self):
+        try:
+            from gluster.storagedev import _parseDevices as parseStorageDevices
+        except ImportError as e:
+            raise SkipTest('%s' % e)
+
         status = parseStorageDevices(glusterTestData.glusterStorageDevData())
         self.assertEquals(status, glusterTestData.GLUSTER_STORAGE_DEVICES)
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index f48b40e..277a4d7 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -120,6 +120,9 @@
 BuildRequires: python-argparse
 BuildRequires: python-ordereddict
 %endif
+%if 0%{?rhel} > 6 || 0%{?fedora}
+BuildRequires: python-blivet
+%endif
 
 # Autotools BuildRequires
 %if 0%{?enable_autotools}
@@ -138,7 +141,6 @@
 BuildRequires: systemd-units
 %endif
 
-Requires: python-blivet
 Requires: ethtool
 Requires: which
 Requires: sudo >= 1.7.3
@@ -697,6 +699,9 @@
 Requires: %{name} = %{version}-%{release}
 Requires: glusterfs-server
 Requires: python-magic
+%if 0%{?rhel} > 6 || 0%{?fedora}
+Requires: python-blivet
+%endif
 
 %description gluster
 Gluster plugin enables VDSM to serve Gluster functionalities.


-- 
To view, visit http://gerrit.ovirt.org/37010
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50d1fe4cc992ab9a40101e1dbbba95c35d2ddcca
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list