commit: 01052907be61f2c0353c8d00db1a9b4ea587bc20
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 17:40:57 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:41:24 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=01052907
tests: Stop using herds
pym/portage/tests/emerge/test_simple.py | 2 --
pym/portage/tests/repoman/test_simple.py | 3 ---
pym/portage/tests/resolver/ResolverPlayground.py | 22 ----------------------
3 files changed, 27 deletions(-)
diff --git a/pym/portage/tests/emerge/test_simple.py
b/pym/portage/tests/emerge/test_simple.py
index 394ed43..e5ecd4b 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -153,14 +153,12 @@ pkg_preinst() {
(
"dev-libs/A",
{
- "herd" : "base-system",
"flags" : "<flag
name='flag'>Description of how USE='flag' affects this package</flag>",
},
),
(
"dev-libs/B",
{
- "herd" : "no-herd",
"flags" : "<flag
name='flag'>Description of how USE='flag' affects this package</flag>",
},
),
diff --git a/pym/portage/tests/repoman/test_simple.py
b/pym/portage/tests/repoman/test_simple.py
index 98220c4..720560b 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -133,21 +133,18 @@ class SimpleRepomanTestCase(TestCase):
(
"dev-libs/A",
{
- "herd" : "base-system",
"flags" : "<flag name='flag'
restrict='>=dev-libs/A-0'>Description of how USE='flag' affects this
package</flag>",
},
),
(
"dev-libs/B",
{
- "herd" : "no-herd",
"flags" : "<flag
name='flag'>Description of how USE='flag' affects this package</flag>",
},
),
(
"dev-libs/C",
{
- "herd" : "no-herd",
"flags" : "<flag
name='flag'>Description of how USE='flag' affects this package</flag>",
},
),
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py
b/pym/portage/tests/resolver/ResolverPlayground.py
index 6bdf2c7..68e047a 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -47,7 +47,6 @@ class ResolverPlayground(object):
metadata_xml_template = """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<herd>%(herd)s</herd>
<maintainer>
<email>maintainer-nee...@gentoo.org</email>
<description>Description of the maintainership</description>
@@ -381,27 +380,6 @@ class ResolverPlayground(object):
#Create profile symlink
os.symlink(sub_profile_dir,
os.path.join(user_config_dir, "make.profile"))
- #Create minimal herds.xml
- herds_xml = """<?xml version="1.0"
encoding="UTF-8"?>
-<!DOCTYPE herds SYSTEM "http://www.gentoo.org/dtd/herds.dtd";>
-<?xml-stylesheet href="/xsl/herds.xsl" type="text/xsl" ?>
-<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl" ?>
-<herds>
-<herd>
- <name>base-system</name>
- <email>base-sys...@gentoo.org</email>
- <description>Core system utilities and libraries.</description>
- <maintainer>
- <email>base-sys...@gentoo.orgg</email>
- <name>Base System</name>
- <role>Base System Maintainer</role>
- </maintainer>
-</herd>
-</herds>
-"""
- with open(os.path.join(metadata_dir,
"metadata.xml"), 'w') as f:
- f.write(herds_xml)
-
make_conf = {
"ACCEPT_KEYWORDS": "x86",
"CLEAN_DELAY": "0",
