aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-03-08 06:44:06 +0000
committerAlec Warner <antarus@gentoo.org>2007-03-08 06:44:06 +0000
commit934a71d5ddeb42dba7dd35ab129760a3482c416f (patch)
tree368d4f3505d0a00122486d2a1f39f1b7b6d1f128 /pym/portage/tests/env
parentPart of my attempt now involves cleaning up config; this means for me; removi... (diff)
downloadportage-934a71d5ddeb42dba7dd35ab129760a3482c416f.tar.gz
portage-934a71d5ddeb42dba7dd35ab129760a3482c416f.tar.bz2
portage-934a71d5ddeb42dba7dd35ab129760a3482c416f.zip
Change load() to have no default arguments, makes caller specifiy explicitly...I think assuming a default arg is bad here. Also add PackageUse and PackageUseFile, change up the comments a bit. I've started to notice code re-use here; these are basically the same code. I think I will write up the rest of the package* classes and then perform code merges to save LOC and memory and whatnot
svn path=/main/trunk/; revision=6192
Diffstat (limited to 'pym/portage/tests/env')
-rw-r--r--pym/portage/tests/env/config/test_PackageKeywordsFile.py2
-rw-r--r--pym/portage/tests/env/config/test_PackageUseFile.py33
2 files changed, 34 insertions, 1 deletions
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
index f39ef96d7..6c5475881 100644
--- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py
+++ b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
@@ -19,7 +19,7 @@ class PackageKeywordsFileTestCase(TestCase):
self.BuildFile()
f = PackageKeywordsFile(self.fname)
- f.load()
+ f.load(recursive=False)
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_PackageUseFile.py b/pym/portage/tests/env/config/test_PackageUseFile.py
new file mode 100644
index 000000000..6dd76eeca
--- /dev/null
+++ b/pym/portage/tests/env/config/test_PackageUseFile.py
@@ -0,0 +1,33 @@
+# test_PackageUseFile.py -- Portage Unit Testing Functionality
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: test_PackageUseFile.py 6182 2007-03-06 07:35:22Z antarus $
+
+from portage.tests import TestCase
+from portage.env.config import PackageUseFile
+
+class PackageUseFileTestCase(TestCase):
+
+ fname = 'package.use'
+ cpv = 'sys-apps/portage'
+ useflags = ['cdrom', 'far', 'boo', 'flag', 'blat']
+
+ def testPackageUseLoad(self):
+ """
+ A simple test to ensure the load works properly
+ """
+ self.BuildFile()
+ f = PackageUseFile(self.fname)
+ f.load(recursive=False)
+ for cpv, use in f.iteritems():
+ self.assertEqual( cpv, self.cpv )
+ [flag for flag in use if self.assertTrue(flag in self.useflags)]
+ self.NukeFile()
+
+ def BuildFile(self):
+ f = open(self.fname, 'wb')
+ f.write("%s %s" % (self.cpv, ' '.join(self.useflags)))
+
+ def NukeFile(self):
+ import os
+ os.unlink(self.fname)