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