From 5a0d4200f3062d35ffd8828eec65ef8695ee8619 Mon Sep 17 00:00:00 2001
From: Alec Warner <antarus@gentoo.org>
Date: Thu, 11 Jan 2007 05:29:35 +0000
Subject: more test re-arranging as Alec can't read what functions are in what
 files

svn path=/main/trunk/; revision=5540
---
 tests/__init__.py                         |  2 +-
 tests/portage/test_match_from_list.py     | 33 -------------------------------
 tests/portage_dep/__init__.py             |  4 ++++
 tests/portage_dep/test_match_from_list.py | 33 +++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 tests/portage/test_match_from_list.py
 create mode 100644 tests/portage_dep/__init__.py
 create mode 100644 tests/portage_dep/test_match_from_list.py

diff --git a/tests/__init__.py b/tests/__init__.py
index f848fc1dd..8d4ea9f0c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -7,7 +7,7 @@ import os, unittest
 
 def main():
 	
-	testDirs = ["portage", "portage_util","portage_versions"]
+	testDirs = ["portage", "portage_util","portage_versions", "portage_dep"]
 
 	suite = unittest.TestSuite()
 
diff --git a/tests/portage/test_match_from_list.py b/tests/portage/test_match_from_list.py
deleted file mode 100644
index 7afe51c5e..000000000
--- a/tests/portage/test_match_from_list.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# test_match_from_list.py -- Portage Unit Testing Functionality
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: test_atoms.py 5525 2007-01-10 13:35:03Z antarus $
-
-from unittest import TestCase
-from portage_dep import match_from_list
-
-class AtomCmpEqualGlob(TestCase):
-        """ A simple testcase for =* glob matching
-        """
-
-        def testEqualGlobPass(self):
-                tests = [ ("=sys-apps/portage-45*", "sys-apps/portage-045" ),
-                          ("=sys-fs/udev-1*", "sys-fs/udev-123"),
-                          ("=sys-fs/udev-4*", "sys-fs/udev-456" ) ]
-
-# I need to look up the cvs syntax
-#                         ("=sys-fs/udev_cvs*","sys-fs/udev_cvs_pre4" ) ]
-
-                for test in tests:
-                        self.failIf( len(match_from_list( test[0], [test[1]] )) != 1,
-                                msg="%s should match %s!" % (test[0], test[1]) )
-
-        def testEqualGlobFail(self):
-                tests = [ ("=sys-apps/portage-2*", "sys-apps/portage-2.1" ),
-                          ("=sys-apps/portage-2.1*", "sys-apps/portage-2.1.2" ) ]
-                for test in tests:
-                        try:
-                                self.failIf( len( match_from_list( test[0], [test[1]] ) ) != 1,
-                                        msg="%s shouldn't match %s!" % (test[0], test[1]) )
-                        except TypeError: # failure is ok here
-                                pass
diff --git a/tests/portage_dep/__init__.py b/tests/portage_dep/__init__.py
new file mode 100644
index 000000000..e1c0ae595
--- /dev/null
+++ b/tests/portage_dep/__init__.py
@@ -0,0 +1,4 @@
+# tests/portage/__init__.py -- Portage Unit Test functionality
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: __init__.py 5522 2007-01-10 12:30:05Z antarus $
diff --git a/tests/portage_dep/test_match_from_list.py b/tests/portage_dep/test_match_from_list.py
new file mode 100644
index 000000000..7afe51c5e
--- /dev/null
+++ b/tests/portage_dep/test_match_from_list.py
@@ -0,0 +1,33 @@
+# test_match_from_list.py -- Portage Unit Testing Functionality
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: test_atoms.py 5525 2007-01-10 13:35:03Z antarus $
+
+from unittest import TestCase
+from portage_dep import match_from_list
+
+class AtomCmpEqualGlob(TestCase):
+        """ A simple testcase for =* glob matching
+        """
+
+        def testEqualGlobPass(self):
+                tests = [ ("=sys-apps/portage-45*", "sys-apps/portage-045" ),
+                          ("=sys-fs/udev-1*", "sys-fs/udev-123"),
+                          ("=sys-fs/udev-4*", "sys-fs/udev-456" ) ]
+
+# I need to look up the cvs syntax
+#                         ("=sys-fs/udev_cvs*","sys-fs/udev_cvs_pre4" ) ]
+
+                for test in tests:
+                        self.failIf( len(match_from_list( test[0], [test[1]] )) != 1,
+                                msg="%s should match %s!" % (test[0], test[1]) )
+
+        def testEqualGlobFail(self):
+                tests = [ ("=sys-apps/portage-2*", "sys-apps/portage-2.1" ),
+                          ("=sys-apps/portage-2.1*", "sys-apps/portage-2.1.2" ) ]
+                for test in tests:
+                        try:
+                                self.failIf( len( match_from_list( test[0], [test[1]] ) ) != 1,
+                                        msg="%s shouldn't match %s!" % (test[0], test[1]) )
+                        except TypeError: # failure is ok here
+                                pass
-- 
cgit v1.2.3-1-g7c22