Merge #499 Fix for running tests out of source tarball

This commit is contained in:
Dennis Gilmore 2017-01-05 12:53:32 +00:00
commit f6f84de1fb
3 changed files with 6 additions and 6 deletions

View File

@ -11,4 +11,4 @@ include tests/*
exclude tests/*.pyc exclude tests/*.pyc
include tests/data/* include tests/data/*
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

View File

@ -5,9 +5,9 @@ Summary: Distribution compose tool
Group: Development/Tools Group: Development/Tools
License: GPLv2 License: GPLv2
URL: https://fedorahosted.org/pungi URL: https://pagure.io/pungi
Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2 Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
BuildRequires: python-nose, python-nose-cov, python-mock BuildRequires: python-nose, python-mock
BuildRequires: python-devel, python-setuptools, python2-productmd BuildRequires: python-devel, python-setuptools, python2-productmd
BuildRequires: python-lockfile, kobo, kobo-rpmlib, python-kickstart, createrepo_c BuildRequires: python-lockfile, kobo, kobo-rpmlib, python-kickstart, createrepo_c
BuildRequires: python-lxml, libselinux-python, yum-utils, lorax BuildRequires: python-lxml, libselinux-python, yum-utils, lorax
@ -86,9 +86,8 @@ rm -rf %{buildroot}
%{_bindir}/%{name}-fedmsg-notification %{_bindir}/%{name}-fedmsg-notification
%check %check
nosetests --exe
./tests/data/specs/build.sh ./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 cd tests && ./test_compose.sh
%changelog %changelog

View File

@ -66,6 +66,7 @@ class UnifiedISO(object):
self.linker = pungi.linker.Linker() self.linker = pungi.linker.Linker()
temp_topdir = os.path.abspath(os.path.join(self.compose_path, "..", "work")) 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.temp_dir = tempfile.mkdtemp(prefix="unified_isos_", dir=temp_topdir)
self.treeinfo = {} # {arch/src: TreeInfo} self.treeinfo = {} # {arch/src: TreeInfo}