From f6f84de1fbcd271fbfa9e1d24389145d98008654 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 05 2017 12:53:32 +0000 Subject: Merge #499 `Fix for running tests out of source tarball` --- diff --git a/MANIFEST.in b/MANIFEST.in index b2876f3..e833ee8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,4 +11,4 @@ include tests/* exclude tests/*.pyc include tests/data/* include tests/data/*/* -recursive-include tests/fixtures *.json *.xml *.bz2 *.gz *.iso *.log MD5SUM SHA1SUM SHA256SUM treeinfo +recursive-include tests/fixtures *.iso *.json *.log *.rpm *.xml *.bz2 *.gz MD5SUM SHA1SUM SHA256SUM .treeinfo diff --git a/pungi.spec b/pungi.spec index cb7bc39..5a6159b 100644 --- a/pungi.spec +++ b/pungi.spec @@ -5,9 +5,9 @@ Summary: Distribution compose tool Group: Development/Tools License: GPLv2 -URL: https://fedorahosted.org/pungi -Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 -BuildRequires: python-nose, python-nose-cov, python-mock +URL: https://pagure.io/pungi +Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: python-nose, python-mock BuildRequires: python-devel, python-setuptools, python2-productmd BuildRequires: python-lockfile, kobo, kobo-rpmlib, python-kickstart, createrepo_c BuildRequires: python-lxml, libselinux-python, yum-utils, lorax @@ -86,9 +86,8 @@ rm -rf %{buildroot} %{_bindir}/%{name}-fedmsg-notification %check +nosetests --exe ./tests/data/specs/build.sh -python2 setup.py test -nosetests --exe --with-cov --cov-report html --cov-config tox.ini cd tests && ./test_compose.sh %changelog diff --git a/pungi_utils/unified_isos.py b/pungi_utils/unified_isos.py index 938467c..605eff5 100644 --- a/pungi_utils/unified_isos.py +++ b/pungi_utils/unified_isos.py @@ -66,6 +66,7 @@ class UnifiedISO(object): self.linker = pungi.linker.Linker() temp_topdir = os.path.abspath(os.path.join(self.compose_path, "..", "work")) + makedirs(temp_topdir) self.temp_dir = tempfile.mkdtemp(prefix="unified_isos_", dir=temp_topdir) self.treeinfo = {} # {arch/src: TreeInfo}