summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-03-25 05:54:47 +0000
committerAlec Warner <antarus@gentoo.org>2007-03-25 05:54:47 +0000
commite1eebf6a63633d807568fa887dac4ea6af75c95d (patch)
treeb50d26bb4c34e9427fa311136011d77c8c63d4ac
parent9ee0a04335c782e20cbbcbece1f70149ce7c57a1 (diff)
downloadportage-e1eebf6a63633d807568fa887dac4ea6af75c95d.tar.gz
portage-e1eebf6a63633d807568fa887dac4ea6af75c95d.tar.bz2
portage-e1eebf6a63633d807568fa887dac4ea6af75c95d.zip
Fix the rest of the tests
svn path=/main/trunk/; revision=6279
-rw-r--r--pym/portage/tests/env/config/test_PackageKeywordsFile.py4
-rw-r--r--pym/portage/tests/env/config/test_PackageMaskFile.py6
-rw-r--r--pym/portage/tests/env/config/test_PackageUseFile.py4
3 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
index 32e9c30c5..f493b82dc 100644
--- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py
+++ b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
@@ -12,7 +12,7 @@ class PackageKeywordsFileTestCase(TestCase):
cpv = 'sys-apps/portage'
keywords = ['~x86', 'amd64', '-mips']
- def testPackageKeywordsLoad(self):
+ def testPackageKeywordsFile(self):
"""
A simple test to ensure the load works properly
"""
@@ -20,7 +20,7 @@ class PackageKeywordsFileTestCase(TestCase):
self.BuildFile()
try:
f = PackageKeywordsFile(self.fname)
- f.load(recursive=False)
+ f.load()
for cpv, keyword in f.iteritems():
self.assertEqual( cpv, self.cpv )
[k for k in keyword if self.assertTrue(k in self.keywords)]
diff --git a/pym/portage/tests/env/config/test_PackageMaskFile.py b/pym/portage/tests/env/config/test_PackageMaskFile.py
index 83c9095fd..d97eeebe8 100644
--- a/pym/portage/tests/env/config/test_PackageMaskFile.py
+++ b/pym/portage/tests/env/config/test_PackageMaskFile.py
@@ -12,12 +12,12 @@ class PackageMaskFileTestCase(TestCase):
atoms = ['sys-apps/portage','dev-util/diffball','not@va1id@t0m']
- def testPackageMaskLoad(self):
+ def testPackageMaskFile(self):
self.BuildFile()
try:
f = PackageMaskFile(self.fname)
- f.load(recursive=False)
- [atom for atom in f.iterkeys() if self.assertTrue(atom in self.atoms)]
+ f.load()
+ [atom for atom in f.keys() if self.assertTrue(atom in self.atoms)]
finally:
self.NukeFile()
diff --git a/pym/portage/tests/env/config/test_PackageUseFile.py b/pym/portage/tests/env/config/test_PackageUseFile.py
index 4638923df..71ab526ff 100644
--- a/pym/portage/tests/env/config/test_PackageUseFile.py
+++ b/pym/portage/tests/env/config/test_PackageUseFile.py
@@ -12,14 +12,14 @@ class PackageUseFileTestCase(TestCase):
cpv = 'sys-apps/portage'
useflags = ['cdrom', 'far', 'boo', 'flag', 'blat']
- def testPackageUseLoad(self):
+ def testPackageUseFile(self):
"""
A simple test to ensure the load works properly
"""
self.BuildFile()
try:
f = PackageUseFile(self.fname)
- f.load(recursive=False)
+ f.load()
for cpv, use in f.iteritems():
self.assertEqual( cpv, self.cpv )
[flag for flag in use if self.assertTrue(flag in self.useflags)]