summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-12-08 01:57:30 +0000
committerAlec Warner <antarus@gentoo.org>2006-12-08 01:57:30 +0000
commit3cba4f460686303d6ab426585d9b726eeac3d3b7 (patch)
tree720c11f3198870ae4c39b08a888833ea049de104
parent3c98c0138c9e9bb0512e98a362335f82d55e8a90 (diff)
downloadportage-3cba4f460686303d6ab426585d9b726eeac3d3b7.tar.gz
portage-3cba4f460686303d6ab426585d9b726eeac3d3b7.tar.bz2
portage-3cba4f460686303d6ab426585d9b726eeac3d3b7.zip
add some portage_util tests
svn path=/main/trunk/; revision=5217
-rw-r--r--tests/__init__.py2
-rw-r--r--tests/test_util.py42
-rw-r--r--tests/test_vercmp.py3
3 files changed, 44 insertions, 3 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index d0d31801d..1a235ff26 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,7 +7,7 @@ import unittest
def main():
- tests = ["test_vercmp"]
+ tests = ["test_vercmp", "test_util"]
suite = unittest.TestSuite()
diff --git a/tests/test_util.py b/tests/test_util.py
new file mode 100644
index 000000000..59d82b9ba
--- /dev/null
+++ b/tests/test_util.py
@@ -0,0 +1,42 @@
+# test_vercmp.py -- Portage Unit Testing Functionality
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: test_vercmp.py 5213 2006-12-08 00:12:41Z antarus $
+
+from unittest import TestCase, TestLoader
+
+class UtilTestCase(TestCase):
+
+ def testUniqueArray(self):
+ pass
+
+ def testVarexpand(self):
+ pass
+
+ def testStackLists(self):
+ pass
+
+ def testStackDicts(self):
+ pass
+
+ def testStackDictList(self):
+ from portage_util import stack_dictlist
+
+ tests = [ ({'a':'b'},{'x':'y'},False,{'a':['b'],'x':['y']}) ]
+ tests.append(( {'KEYWORDS':['alpha','x86']},{'KEYWORDS':['-*']},True,{} ))
+ tests.append(( {'KEYWORDS':['alpha','x86']},{'KEYWORDS':['-x86']},True,{'KEYWORDS':['alpha']} ))
+ for test in tests:
+ self.failUnless(stack_dictlist([test[0],test[1]],incremental=test[2]) == test[3],
+ msg="%s and %s combined, was expecting: %s and got: %s" % (test[0],test[1],test[3],
+ stack_dictlist([test[0],test[1]],incremental=test[2])) )
+
+ def testNormalizePath(self):
+
+ from portage_util import normalize_path
+ path = "///foo/bar/baz"
+ good = "/foo/bar/baz"
+ self.failUnless(normalize_path(path) == good, msg="NormalizePath(%s) failed to produce %s" % (path, good))
+
+def suite():
+ return TestLoader().loadTestsFromTestCase(UtilTestCase)
+
diff --git a/tests/test_vercmp.py b/tests/test_vercmp.py
index ffab892ed..624950cf5 100644
--- a/tests/test_vercmp.py
+++ b/tests/test_vercmp.py
@@ -42,6 +42,5 @@ class VerCmpTestCase(TestCase):
self.failIf( vercmp( test[0], test[1]) == 0, msg="%s == %s? Wrong!" % (test[0],test[1]))
def suite():
- suite = TestLoader().loadTestsFromTestCase(VerCmpTestCase)
- return suite
+ return TestLoader().loadTestsFromTestCase(VerCmpTestCase)