diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2013-07-13 11:49:57 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2013-07-13 11:49:57 +0200 |
| commit | c7f2b8a6878bda5b9251af3aa5164f57fe0627fc (patch) | |
| tree | 3ee2815c1ee1b0a6725ac1dac24736f467cb4397 /pym/portage/tests/ebuild | |
| parent | egencache: Support --repositories-configuration option. (diff) | |
| download | portage-c7f2b8a6878bda5b9251af3aa5164f57fe0627fc.tar.gz portage-c7f2b8a6878bda5b9251af3aa5164f57fe0627fc.tar.bz2 portage-c7f2b8a6878bda5b9251af3aa5164f57fe0627fc.zip | |
Use PORTAGE_REPOSITORIES in test suite.
Diffstat (limited to 'pym/portage/tests/ebuild')
| -rw-r--r-- | pym/portage/tests/ebuild/test_config.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pym/portage/tests/ebuild/test_config.py b/pym/portage/tests/ebuild/test_config.py index 38e8b6edb..cee2435a7 100644 --- a/pym/portage/tests/ebuild/test_config.py +++ b/pym/portage/tests/ebuild/test_config.py @@ -1,4 +1,4 @@ -# Copyright 2010-2012 Gentoo Foundation +# Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import portage @@ -239,28 +239,30 @@ class ConfigTestCase(TestCase): playground = ResolverPlayground(ebuilds=ebuilds, repo_configs=repo_configs, distfiles=distfiles) + settings = playground.settings - new_repo_config = playground.settings.repositories.prepos['new_repo'] + 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.thin_manifest, True, "new_repo_config.thin_manifest != True") - new_manifest_file = os.path.join(playground.repo_dirs["new_repo"], "dev-libs", "A", "Manifest") + new_manifest_file = os.path.join(new_repo_config.location, "dev-libs", "A", "Manifest") self.assertEqual(os.path.exists(new_manifest_file), False) - new_manifest_file = os.path.join(playground.repo_dirs["new_repo"], "dev-libs", "B", "Manifest") + new_manifest_file = os.path.join(new_repo_config.location, "dev-libs", "B", "Manifest") f = open(new_manifest_file) self.assertEqual(len(list(f)), 1) f.close() - new_manifest_file = os.path.join(playground.repo_dirs["new_repo"], "dev-libs", "C", "Manifest") + new_manifest_file = os.path.join(new_repo_config.location, "dev-libs", "C", "Manifest") f = open(new_manifest_file) self.assertEqual(len(list(f)), 2) f.close() - old_manifest_file = os.path.join(playground.repo_dirs["old_repo"], "dev-libs", "A", "Manifest") + old_manifest_file = os.path.join(old_repo_config.location, "dev-libs", "A", "Manifest") f = open(old_manifest_file) self.assertEqual(len(list(f)), 1) f.close() |