[java-sig-commits] [javapackages] [test] Fix loading of macros in testsuite

commit a8de8ebce7aee4acdc517b38f4aea2884e78bba7 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; Date: Mon Feb 3 13:46:36 2014 +0100 [test] Fix loading of macros in testsuite test/test_rpmbuild.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/test/test_rpmbuild.py b/test/test_rpmbuild.py index 9299028..51251d3 100644 --- a/test/test_rpmbuild.py +++ b/test/test_rpmbuild.py @@ -173,13 +173,13 @@ class Package(object): shutil.copy(sourcepath, os.path.join(destpath, targetname)) def _prepare_macros(): - etcpath = os.path.join(DIRPATH, '..', 'etc') + macropath = os.path.join(DIRPATH, '..', 'macros.d') java_utils = os.path.abspath(os.path.join(DIRPATH, '..', 'java-utils')) with open('.rpmmacros', 'w') as rpmmacros: - for filepath in os.listdir(etcpath): + for filepath in os.listdir(macropath): if filepath.startswith('macros'): - with open(os.path.join(etcpath, filepath), 'r') as macrofile: + with open(os.path.join(macropath, filepath), 'r') as macrofile: for line in macrofile: if '/usr/share/java-utils' in line: rpmmacros.write(re.sub(r'/usr/share/java-utils',