aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2013-07-13 13:07:16 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2013-07-13 13:07:16 +0200
commit4522ed9a21bdcb54bb06a4a464301f8e4a6d4230 (patch)
tree32ccb3b169c7b26ee00453a0e53ba39749c5f64e /pym/portage/tests/ebuild
parentMove default configuration of repositories from /usr/share/portage/config/mak... (diff)
downloadportage-4522ed9a21bdcb54bb06a4a464301f8e4a6d4230.tar.gz
portage-4522ed9a21bdcb54bb06a4a464301f8e4a6d4230.tar.bz2
portage-4522ed9a21bdcb54bb06a4a464301f8e4a6d4230.zip
Use consistent paths of repositories in test suite and clean some code.
Diffstat (limited to 'pym/portage/tests/ebuild')
-rw-r--r--pym/portage/tests/ebuild/test_config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/tests/ebuild/test_config.py b/pym/portage/tests/ebuild/test_config.py
index cee2435a7..275663c89 100644
--- a/pym/portage/tests/ebuild/test_config.py
+++ b/pym/portage/tests/ebuild/test_config.py
@@ -92,7 +92,7 @@ class ConfigTestCase(TestCase):
try:
portage.util.noiselimit = -2
- license_group_locations = (os.path.join(playground.portdir, "profiles"),)
+ license_group_locations = (os.path.join(playground.settings.repositories["test_repo"].location, "profiles"),)
pkg_license = os.path.join(playground.eroot, "etc", "portage")
lic_man = LicenseManager(license_group_locations, pkg_license)
@@ -244,8 +244,8 @@ class ConfigTestCase(TestCase):
new_repo_config = settings.repositories["new_repo"]
old_repo_config = settings.repositories["old_repo"]
self.assertTrue(len(new_repo_config.masters) > 0, "new_repo has no default master")
- self.assertEqual(new_repo_config.masters[0].user_location, playground.portdir,
- "new_repo default master is not PORTDIR")
+ self.assertEqual(new_repo_config.masters[0].user_location, playground.settings.repositories["test_repo"].location,
+ "new_repo default master is not test_repo")
self.assertEqual(new_repo_config.thin_manifest, True,
"new_repo_config.thin_manifest != True")