| 1 |
commit: 5771d5b99f52be8c27f22d43b7a08fd555b2d893 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 17 08:06:26 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 25 15:28:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5771d5b9 |
| 7 |
|
| 8 |
tests: Stop using herds |
| 9 |
|
| 10 |
pym/portage/tests/emerge/test_simple.py | 2 -- |
| 11 |
pym/portage/tests/repoman/test_simple.py | 3 --- |
| 12 |
pym/portage/tests/resolver/ResolverPlayground.py | 22 ---------------------- |
| 13 |
3 files changed, 27 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 16 |
index 394ed43..e5ecd4b 100644 |
| 17 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 18 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 19 |
@@ -153,14 +153,12 @@ pkg_preinst() { |
| 20 |
( |
| 21 |
"dev-libs/A", |
| 22 |
{ |
| 23 |
- "herd" : "base-system", |
| 24 |
"flags" : "<flag name='flag'>Description of how USE='flag' affects this package</flag>", |
| 25 |
}, |
| 26 |
), |
| 27 |
( |
| 28 |
"dev-libs/B", |
| 29 |
{ |
| 30 |
- "herd" : "no-herd", |
| 31 |
"flags" : "<flag name='flag'>Description of how USE='flag' affects this package</flag>", |
| 32 |
}, |
| 33 |
), |
| 34 |
|
| 35 |
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py |
| 36 |
index 98220c4..720560b 100644 |
| 37 |
--- a/pym/portage/tests/repoman/test_simple.py |
| 38 |
+++ b/pym/portage/tests/repoman/test_simple.py |
| 39 |
@@ -133,21 +133,18 @@ class SimpleRepomanTestCase(TestCase): |
| 40 |
( |
| 41 |
"dev-libs/A", |
| 42 |
{ |
| 43 |
- "herd" : "base-system", |
| 44 |
"flags" : "<flag name='flag' restrict='>=dev-libs/A-0'>Description of how USE='flag' affects this package</flag>", |
| 45 |
}, |
| 46 |
), |
| 47 |
( |
| 48 |
"dev-libs/B", |
| 49 |
{ |
| 50 |
- "herd" : "no-herd", |
| 51 |
"flags" : "<flag name='flag'>Description of how USE='flag' affects this package</flag>", |
| 52 |
}, |
| 53 |
), |
| 54 |
( |
| 55 |
"dev-libs/C", |
| 56 |
{ |
| 57 |
- "herd" : "no-herd", |
| 58 |
"flags" : "<flag name='flag'>Description of how USE='flag' affects this package</flag>", |
| 59 |
}, |
| 60 |
), |
| 61 |
|
| 62 |
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py |
| 63 |
index 6bdf2c7..68e047a 100644 |
| 64 |
--- a/pym/portage/tests/resolver/ResolverPlayground.py |
| 65 |
+++ b/pym/portage/tests/resolver/ResolverPlayground.py |
| 66 |
@@ -47,7 +47,6 @@ class ResolverPlayground(object): |
| 67 |
metadata_xml_template = """<?xml version="1.0" encoding="UTF-8"?> |
| 68 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 69 |
<pkgmetadata> |
| 70 |
-<herd>%(herd)s</herd> |
| 71 |
<maintainer> |
| 72 |
<email>maintainer-needed@g.o</email> |
| 73 |
<description>Description of the maintainership</description> |
| 74 |
@@ -381,27 +380,6 @@ class ResolverPlayground(object): |
| 75 |
#Create profile symlink |
| 76 |
os.symlink(sub_profile_dir, os.path.join(user_config_dir, "make.profile")) |
| 77 |
|
| 78 |
- #Create minimal herds.xml |
| 79 |
- herds_xml = """<?xml version="1.0" encoding="UTF-8"?> |
| 80 |
-<!DOCTYPE herds SYSTEM "http://www.gentoo.org/dtd/herds.dtd"> |
| 81 |
-<?xml-stylesheet href="/xsl/herds.xsl" type="text/xsl" ?> |
| 82 |
-<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl" ?> |
| 83 |
-<herds> |
| 84 |
-<herd> |
| 85 |
- <name>base-system</name> |
| 86 |
- <email>base-system@g.o</email> |
| 87 |
- <description>Core system utilities and libraries.</description> |
| 88 |
- <maintainer> |
| 89 |
- <email>base-system@××××××.orgg</email> |
| 90 |
- <name>Base System</name> |
| 91 |
- <role>Base System Maintainer</role> |
| 92 |
- </maintainer> |
| 93 |
-</herd> |
| 94 |
-</herds> |
| 95 |
-""" |
| 96 |
- with open(os.path.join(metadata_dir, "metadata.xml"), 'w') as f: |
| 97 |
- f.write(herds_xml) |
| 98 |
- |
| 99 |
make_conf = { |
| 100 |
"ACCEPT_KEYWORDS": "x86", |
| 101 |
"CLEAN_DELAY": "0", |
Archives