Fix the rest of the tests

svn path=/main/trunk/; revision=6279

diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
index 32e9c30c51dcc6d28bf5a9a3dccd1cece03ff2b2..f493b82dc890cd9b8841465621ba7d15d0d3cd20 100644 (file)
--- 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 83c9095fd37ec228b7fedadfc95f34b76a46acf3..d97eeebe87d904755396721e30520cb93432b23e 100644 (file)
--- 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 4638923df7baa6e8eee2ea2f5bd0715d6a939cff..71ab526fffcd774d07161021b2b8c51be8d77995 100644 (file)
--- 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)]