aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-04-16 19:40:57 +0200
committerMichał Górny <mgorny@gentoo.org>2016-04-16 21:00:37 +0200
commit309851c86bfd0e543aa3103e8af07d7b3738fd5a (patch)
treefa3bcb898305b0645cd9c83fbd98329ee0306953
parenttemp fix (diff)
downloadportage-309851c86bfd0e543aa3103e8af07d7b3738fd5a.tar.gz
portage-309851c86bfd0e543aa3103e8af07d7b3738fd5a.tar.bz2
portage-309851c86bfd0e543aa3103e8af07d7b3738fd5a.zip
tests: Stop using herds
-rw-r--r--pym/portage/tests/emerge/test_simple.py2
-rw-r--r--pym/portage/tests/repoman/test_simple.py3
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py22
3 files changed, 0 insertions, 27 deletions
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 394ed430b..e5ecd4b7e 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 98220c472..720560b32 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='&gt;=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 6bdf2c7e6..68e047a46 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-needed@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-system@gentoo.org</email>
- <description>Core system utilities and libraries.</description>
- <maintainer>
- <email>base-system@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",