Martin Sivák has uploaded a new change for review. Change subject: Remove VDSM build dependency ......................................................................
Remove VDSM build dependency The testsuite is not using VDSM at all, but the implementation imports it. This fixes the test file so VDSM is mocked and can be removed from the spec file. Change-Id: I6a601459989da1ffc03469143004a7edf4224fac Signed-off-by: Martin Sivak <[email protected]> --- M ovirt-hosted-engine-ha.spec.in M ovirt_hosted_engine_ha/lib/storage_backends_test.py 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha refs/changes/75/38275/1 diff --git a/ovirt-hosted-engine-ha.spec.in b/ovirt-hosted-engine-ha.spec.in index 5eb982d..87db696 100644 --- a/ovirt-hosted-engine-ha.spec.in +++ b/ovirt-hosted-engine-ha.spec.in @@ -58,7 +58,6 @@ BuildRequires: python2-devel BuildRequires: python-nose BuildRequires: python-mock -BuildRequires: vdsm-cli >= 4.17.0 %if 0%{?with_systemd} %{?systemd_requires} diff --git a/ovirt_hosted_engine_ha/lib/storage_backends_test.py b/ovirt_hosted_engine_ha/lib/storage_backends_test.py index 7ec47f3..d2141ee 100644 --- a/ovirt_hosted_engine_ha/lib/storage_backends_test.py +++ b/ovirt_hosted_engine_ha/lib/storage_backends_test.py @@ -5,6 +5,11 @@ from mock import Mock, call +# Mock vdsm.vdscli to be able to build on machine with no VDSM +import sys +sys.modules["vdsm"] = Mock() +sys.modules["vdsm.vdscli"] = Mock() + from .storage_backends import FilesystemBackend, BackendFailureException from .storage_backends import BlockBackend from ..env import constants -- To view, visit https://gerrit.ovirt.org/38275 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a601459989da1ffc03469143004a7edf4224fac Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Martin Sivák <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
