diff tests/run.py @ 851:9ce00cb1d676

Merge alternate tunnel schemes.
author Augie Fackler <durin42@gmail.com>
date Sat, 25 Feb 2012 14:51:22 -0600
parents 312b37bc5e20
children d3ff5807f1bd
line wrap: on
line diff
--- a/tests/run.py
+++ b/tests/run.py
@@ -93,23 +93,23 @@ if __name__ == '__main__':
         import tempfile
         sys.stdout = tempfile.TemporaryFile()
 
-    all = tests()
+    all_tests = tests()
 
     args = [i.split('.py')[0].replace('-', '_') for i in args]
 
     if not args:
         check = lambda x: options.comprehensive or not comprehensive(x)
-        mods = [m for (n, m) in sorted(all.iteritems()) if check(m)]
+        mods = [m for (n, m) in sorted(all_tests.iteritems()) if check(m)]
         suite = [m.suite() for m in mods]
     else:
         suite = []
         for arg in args:
             if arg == 'test_util':
                 continue
-            elif arg not in all:
+            elif arg not in all_tests:
                 print >> sys.stderr, 'test module %s not available' % arg
             else:
-                suite.append(all[arg].suite())
+                suite.append(all_tests[arg].suite())
 
     runner = unittest.TextTestRunner(**testargs)
     result = runner.run(unittest.TestSuite(suite))