From 707aa6e9662c4a6f4572914717138d6e0f3ddaf7 Mon Sep 17 00:00:00 2001
From: Alec Warner <antarus@gentoo.org>
Date: Sat, 27 Jan 2007 18:12:48 +0000
Subject: [PATCH] fix namespacing in tests

svn path=/main/trunk/; revision=5792
---
 tests/__init__.py                         | 2 +-
 tests/portage_dep/__init__.py             | 2 +-
 tests/portage_dep/test_dep_getcpv.py      | 2 +-
 tests/portage_dep/test_dep_getslot.py     | 2 +-
 tests/portage_dep/test_get_operator.py    | 2 +-
 tests/portage_dep/test_isjustname.py      | 2 +-
 tests/portage_dep/test_isvalidatom.py     | 2 +-
 tests/portage_dep/test_match_from_list.py | 2 +-
 tests/portage_news/__init__.py            | 2 +-
 tests/portage_util/__init__.py            | 2 +-
 tests/portage_util/test_grabdict.py       | 2 +-
 tests/portage_util/test_normalizedPath.py | 2 +-
 tests/portage_util/test_stackDictList.py  | 2 +-
 tests/portage_util/test_stackDicts.py     | 2 +-
 tests/portage_util/test_stackLists.py     | 2 +-
 tests/portage_util/test_uniqueArray.py    | 4 ++--
 tests/portage_util/test_varExpand.py      | 2 +-
 tests/portage_versions/__init__.py        | 2 +-
 tests/portage_versions/test_vercmp.py     | 4 ++--
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index 4ac94383f..66aaf28ce 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,7 +7,7 @@ import os, unittest
 
 def main():
 	
-	testDirs = ["portage", "portage_util","portage_versions", "portage_dep"]
+	testDirs = ["portage", "portage.util","portage.versions", "portage.dep"]
 
 	suite = unittest.TestSuite()
 
diff --git a/tests/portage_dep/__init__.py b/tests/portage_dep/__init__.py
index a258eec60..a3226c133 100644
--- a/tests/portage_dep/__init__.py
+++ b/tests/portage_dep/__init__.py
@@ -1,4 +1,4 @@
-# tests/portage_dep/__init__.py -- Portage Unit Test functionality
+# tests/portage.dep/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/tests/portage_dep/test_dep_getcpv.py b/tests/portage_dep/test_dep_getcpv.py
index d4d78d9a9..857a408a3 100644
--- a/tests/portage_dep/test_dep_getcpv.py
+++ b/tests/portage_dep/test_dep_getcpv.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import dep_getcpv
+from portage.dep import dep_getcpv
 
 class DepGetCPV(TestCase):
 	""" A simple testcase for isvalidatom
diff --git a/tests/portage_dep/test_dep_getslot.py b/tests/portage_dep/test_dep_getslot.py
index 9801e064b..7c3004d05 100644
--- a/tests/portage_dep/test_dep_getslot.py
+++ b/tests/portage_dep/test_dep_getslot.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import dep_getslot
+from portage.dep import dep_getslot
 
 class DepGetSlot(TestCase):
 	""" A simple testcase for isvalidatom
diff --git a/tests/portage_dep/test_get_operator.py b/tests/portage_dep/test_get_operator.py
index 72063f39a..28485e0f0 100644
--- a/tests/portage_dep/test_get_operator.py
+++ b/tests/portage_dep/test_get_operator.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import get_operator
+from portage.dep import get_operator
 
 class GetOperator(TestCase):
 
diff --git a/tests/portage_dep/test_isjustname.py b/tests/portage_dep/test_isjustname.py
index 324224413..e419e3f26 100644
--- a/tests/portage_dep/test_isjustname.py
+++ b/tests/portage_dep/test_isjustname.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import isjustname
+from portage.dep import isjustname
 
 class IsJustName(TestCase):
 
diff --git a/tests/portage_dep/test_isvalidatom.py b/tests/portage_dep/test_isvalidatom.py
index ed66b3487..d373a52f0 100644
--- a/tests/portage_dep/test_isvalidatom.py
+++ b/tests/portage_dep/test_isvalidatom.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import isvalidatom
+from portage.dep import isvalidatom
 
 class IsValidAtom(TestCase):
 	""" A simple testcase for isvalidatom
diff --git a/tests/portage_dep/test_match_from_list.py b/tests/portage_dep/test_match_from_list.py
index d9d53ccbd..4868184a6 100644
--- a/tests/portage_dep/test_match_from_list.py
+++ b/tests/portage_dep/test_match_from_list.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_dep import match_from_list
+from portage.dep import match_from_list
 
 class AtomCmpEqualGlob(TestCase):
         """ A simple testcase for =* glob matching
diff --git a/tests/portage_news/__init__.py b/tests/portage_news/__init__.py
index cc7420e1f..aeaa49195 100644
--- a/tests/portage_news/__init__.py
+++ b/tests/portage_news/__init__.py
@@ -1,4 +1,4 @@
-# tests/portage_news/__init__.py -- Portage Unit Test functionality
+# tests/portage.news/__init__.py -- Portage Unit Test functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/tests/portage_util/__init__.py b/tests/portage_util/__init__.py
index 9325f85f1..9a66903d1 100644
--- a/tests/portage_util/__init__.py
+++ b/tests/portage_util/__init__.py
@@ -1,4 +1,4 @@
-# tests/portage_util/__init__.py -- Portage Unit Test functionality
+# tests/portage.util/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/tests/portage_util/test_grabdict.py b/tests/portage_util/test_grabdict.py
index 9b995fa24..9f7b58921 100644
--- a/tests/portage_util/test_grabdict.py
+++ b/tests/portage_util/test_grabdict.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase, TestLoader
-from portage_util import grabdict
+from portage.util import grabdict
 
 class GrabDictTestCase(TestCase):
 	
diff --git a/tests/portage_util/test_normalizedPath.py b/tests/portage_util/test_normalizedPath.py
index 9740306aa..bd575d266 100644
--- a/tests/portage_util/test_normalizedPath.py
+++ b/tests/portage_util/test_normalizedPath.py
@@ -9,7 +9,7 @@ class NormalizePathTestCase(TestCase):
 	
 	def testNormalizePath(self):
 		
-		from portage_util import normalize_path
+		from portage.util import normalize_path
 		path = "///foo/bar/baz"
 		good = "/foo/bar/baz"
 		self.assertEqual(normalize_path(path), good)
diff --git a/tests/portage_util/test_stackDictList.py b/tests/portage_util/test_stackDictList.py
index 45b67b838..9e7a38ba1 100644
--- a/tests/portage_util/test_stackDictList.py
+++ b/tests/portage_util/test_stackDictList.py
@@ -8,7 +8,7 @@ from unittest import TestCase
 class StackDictListTestCase(TestCase):
 
 	def testStackDictList(self):
-		from portage_util import stack_dictlist
+		from portage.util import stack_dictlist
 		
 		tests = [ ({'a':'b'},{'x':'y'},False,{'a':['b'],'x':['y']}) ]
 		tests.append(( {'KEYWORDS':['alpha','x86']},{'KEYWORDS':['-*']},True,{} ))
diff --git a/tests/portage_util/test_stackDicts.py b/tests/portage_util/test_stackDicts.py
index 7293004b6..9d9637440 100644
--- a/tests/portage_util/test_stackDicts.py
+++ b/tests/portage_util/test_stackDicts.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_util import stack_dicts
+from portage.util import stack_dicts
 
 
 class StackDictsTestCase(TestCase):
diff --git a/tests/portage_util/test_stackLists.py b/tests/portage_util/test_stackLists.py
index 9a88902da..3fc028323 100644
--- a/tests/portage_util/test_stackLists.py
+++ b/tests/portage_util/test_stackLists.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase
-from portage_util import stack_lists
+from portage.util import stack_lists
 
 class StackListsTestCase(TestCase):
 	
diff --git a/tests/portage_util/test_uniqueArray.py b/tests/portage_util/test_uniqueArray.py
index c9c9e217d..62a315321 100644
--- a/tests/portage_util/test_uniqueArray.py
+++ b/tests/portage_util/test_uniqueArray.py
@@ -4,13 +4,13 @@
 # $Id$
 
 from unittest import TestCase
-from portage_util import unique_array
+from portage.util import unique_array
 
 class UniqueArrayTestCase(TestCase):
 	
 	def testUniqueArrayPass(self):
 		"""
-		test portage_util.uniqueArray()
+		test portage.util.uniqueArray()
 		"""
 
 		import os
diff --git a/tests/portage_util/test_varExpand.py b/tests/portage_util/test_varExpand.py
index 0515bf7e5..47dc7de2c 100644
--- a/tests/portage_util/test_varExpand.py
+++ b/tests/portage_util/test_varExpand.py
@@ -4,7 +4,7 @@
 # $Id$
 
 from unittest import TestCase, TestLoader
-from portage_util import varexpand
+from portage.util import varexpand
 
 class VarExpandTestCase(TestCase):
 	
diff --git a/tests/portage_versions/__init__.py b/tests/portage_versions/__init__.py
index 76f62f969..5e5b216fb 100644
--- a/tests/portage_versions/__init__.py
+++ b/tests/portage_versions/__init__.py
@@ -1,4 +1,4 @@
-# tests/portage_versions/__init__.py -- Portage Unit Test functionality
+# tests/portage.versions/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/tests/portage_versions/test_vercmp.py b/tests/portage_versions/test_vercmp.py
index 117472e49..ee3d37741 100644
--- a/tests/portage_versions/test_vercmp.py
+++ b/tests/portage_versions/test_vercmp.py
@@ -4,10 +4,10 @@
 # $Id$
 
 from unittest import TestCase
-from portage_versions import vercmp
+from portage.versions import vercmp
 
 class VerCmpTestCase(TestCase):
-	""" A simple testCase for portage_versions.vercmp()
+	""" A simple testCase for portage.versions.vercmp()
 	"""
 	
 	def testVerCmpGreater(self):
-- 
2.26.2