Moved old wildcard tests into proper test suite.

IPython/utils/tests/test_wildcard.py

@@ -1,8 +1,18 b''
-# -*- coding: UTF-8 -*-
-import sys, unittest
-sys.path.append ('..')
+"""Some tests for the wildcard utilities."""
 
-from IPython import wildcard
+#-----------------------------------------------------------------------------
+# Library imports
+#-----------------------------------------------------------------------------
+# Stdlib
+import sys
+import unittest
+
+# Our own
+from IPython.utils import wildcard
+
+#-----------------------------------------------------------------------------
+# Globals for test
+#-----------------------------------------------------------------------------
 
 class obj_t(object):
     pass
@@ -34,6 +44,10 b' root.__ANKA.a=10'
 root.__ANKA._a=20
 root.__ANKA.__a=20
 
+#-----------------------------------------------------------------------------
+# Test cases
+#-----------------------------------------------------------------------------
+
 class Tests (unittest.TestCase):
     def test_case(self):
         ns=root.__dict__
@@ -46,7 +60,8 b' class Tests (unittest.TestCase):'
         ]
         for pat,res in tests:
             res.sort()
-            a=wildcard.list_namespace(ns,"all",pat,ignore_case=False,show_all=False).keys()
+            a=wildcard.list_namespace(ns,"all",pat,ignore_case=False,
+                                      show_all=False).keys()
             a.sort()
             self.assertEqual(a,res)
 
@@ -61,7 +76,8 b' class Tests (unittest.TestCase):'
         ]
         for pat,res in tests:
             res.sort()
-            a=wildcard.list_namespace(ns,"all",pat,ignore_case=False,show_all=True).keys()
+            a=wildcard.list_namespace(ns,"all",pat,ignore_case=False,
+                                      show_all=True).keys()
             a.sort()
             self.assertEqual(a,res)
 
@@ -70,14 +86,16 b' class Tests (unittest.TestCase):'
         ns=root.__dict__
         tests=[
          ("a*",     ["abbot","abel","ABEL","active","arna",]),
-         ("?b*.?o*",["abbot.koppel","abbot.loop","abel.koppel","abel.loop","ABEL.koppel","ABEL.loop",]),
+         ("?b*.?o*",["abbot.koppel","abbot.loop","abel.koppel","abel.loop",
+                     "ABEL.koppel","ABEL.loop",]),
          ("_a*",    []),
          ("_*anka", ["__anka","__ANKA",]),
          ("_*a*",   ["__anka","__ANKA",]),
         ]
         for pat,res in tests:
             res.sort()
-            a=wildcard.list_namespace(ns,"all",pat,ignore_case=True,show_all=False).keys()
+            a=wildcard.list_namespace(ns,"all",pat,ignore_case=True,
+                                      show_all=False).keys()
             a.sort()
             self.assertEqual(a,res)
 
@@ -85,16 +103,15 b' class Tests (unittest.TestCase):'
         ns=root.__dict__
         tests=[
          ("a*",     ["abbot","abel","ABEL","active","arna",]),
-         ("?b*.?o*",["abbot.koppel","abbot.loop","abel.koppel","abel.loop","ABEL.koppel","ABEL.loop",]),
+         ("?b*.?o*",["abbot.koppel","abbot.loop","abel.koppel","abel.loop",
+                     "ABEL.koppel","ABEL.loop",]),
          ("_a*",    ["_apan","_APAN"]),
          ("_*anka", ["__anka","__ANKA",]),
          ("_*a*",   ["__anka","__ANKA","_apan","_APAN"]),
         ]
         for pat,res in tests:
             res.sort()
-            a=wildcard.list_namespace(ns,"all",pat,ignore_case=True,show_all=True).keys()
+            a=wildcard.list_namespace(ns,"all",pat,ignore_case=True,
+                                      show_all=True).keys()
             a.sort()
             self.assertEqual(a,res)
-            
-if __name__ == '__main__':
-    unittest.main()
  No newline at end of file