Change in vdsm[master]: tests: skip py3 tests on el7

danken at redhat.com danken at redhat.com
Wed Dec 9 10:25:45 UTC 2015


Dan Kenigsberg has uploaded a new change for review.

Change subject: tests: skip py3 tests on el7
......................................................................

tests: skip py3 tests on el7

Unfortunately, python3-{nose,six} are not yet available on el7.
Until they do, we must not require them.

Change-Id: Iedd9971a3b8808bc18c4d383d4b3bda2d3221666
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/Makefile.am
M vdsm.spec.in
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/61/50161/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 718b207..2f08164 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -237,5 +237,6 @@
 	@echo '*** into your environment.  Do not submit untested code!    ***'
 	$(top_srcdir)/tests/run_tests_local.sh crossImportsTests.py
 	$(top_srcdir)/tests/run_tests_local.sh $(test_modules) $(device_modules)
-	PYTHON_EXE=python3 $(top_srcdir)/tests/run_tests_local.sh \
+	[ -x `which python3` ] && \
+		PYTHON_EXE=python3 $(top_srcdir)/tests/run_tests_local.sh \
 		$(test_modules_py3)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 890a517..8e8e0c5 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -87,8 +87,10 @@
 BuildRequires: rpm-python
 BuildRequires: python-blivet
 
+%if 0%{?fedora}
 BuildRequires: python3-nose
 BuildRequires: python3-six
+%endif
 
 # Autotools BuildRequires
 %if 0%{?enable_autotools}


-- 
To view, visit https://gerrit.ovirt.org/50161
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedd9971a3b8808bc18c4d383d4b3bda2d3221666
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