commit: 4d7792fc2d633011b158780d670e57212961f933
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 23:17:45 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 23:19:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d7792fc
SimpleRepomanTestCase: suppress metadata.dtd fetch (fix travis-ci failure)
pym/portage/tests/repoman/test_simple.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/pym/portage/tests/repoman/test_simple.py
b/pym/portage/tests/repoman/test_simple.py
index af6f95d..98220c4 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -7,7 +7,6 @@ import time
import portage
from portage import os
-from portage import shutil
from portage import _unicode_decode
from portage.const import PORTAGE_BASE_PATH, PORTAGE_PYM_PATH
from portage.process import find_binary
@@ -273,11 +272,9 @@ class SimpleRepomanTestCase(TestCase):
# involving canonical vs. non-canonical paths.
test_repo_symlink = os.path.join(eroot,
"test_repo_symlink")
os.symlink(test_repo_location, test_repo_symlink)
- # repoman checks metadata.dtd for recent CTIME, so copy
the file in
- # order to ensure that the CTIME is current
- # NOTE: if we don't have the file around, let repoman
try to fetch it.
- if os.path.exists(metadata_dtd):
- shutil.copyfile(metadata_dtd,
os.path.join(distdir, "metadata.dtd"))
+ metadata_dtd_dest = os.path.join(test_repo_location,
'metadata/dtd/metadata.dtd')
+ os.makedirs(os.path.dirname(metadata_dtd_dest))
+ os.symlink(metadata_dtd, metadata_dtd_dest)
if debug:
# The subprocess inherits both stdout and
stderr, for
