Merge lp:~mandel/ubuntuone-dev-tools/allow_ignore_modules into lp:ubuntuone-dev-tools

[Manuel de la Peña]

Added extra commnad line option to ignore test modules from the test run to fix lp:692516

Added extra commnad line option to ignore test modules from the test run to fix lp:692516

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

ignored = [n.strip() for n in ignored.split(',')]

 should be

ignored = map(str.strip, ignored.split(','))

Also, "not test in ignored" is best read as "test not in ignored".
Please fix those before land.

review: Approve

[lp:~mandel/ubuntuone-dev-tools/allow_ignore_modules]

16. By Manuel de la Peña on 2010-12-20

Make code more pythonic.

=== modified file 'bin/u1trial'
--- bin/u1trial	2010-12-13 20:32:49 +0000
+++ bin/u1trial	2010-12-20 15:36:55 +0000
@@ -89,13 +89,19 @@
         else:
             return unittest.defaultTestLoader.loadTestsFromModule(module)
 
-    def _collect_tests(self, path, test_pattern):
+    def _collect_tests(self, path, test_pattern, ignored):
         """Return the set of unittests."""
         suite = unittest.TestSuite()
         if test_pattern:
             pattern = re.compile('.*%s.*' % test_pattern)
         else:
             pattern = None
+            
+        # get the ignored modules/tests
+        if ignored:
+            ignored = map(str.strip, ignored.split(','))
+        else:
+            ignored = []
 
         # Disable this lint warning as we need to access _tests in the
         # test suites, to collect the tests
@@ -122,7 +128,7 @@
         for root, dirs, files in os.walk(path):
             for test in files:
                 filepath = os.path.join(root, test)
-                if test.endswith(".py"):
+                if test.endswith(".py") and test not in ignored:
                     self.source_files.append(filepath)
                     if test.startswith("test_"):
                         module_suite = self._load_unittest(filepath)
@@ -145,7 +151,7 @@
             coverage.start()
 
         try:
-            suite = self._collect_tests(path, options.test)
+            suite = self._collect_tests(path, options.test, options.ignored)
             if options.loops:
                 old_suite = suite
                 suite = unittest.TestSuite()
@@ -188,7 +194,10 @@
                       metavar="LOOPS")
     parser.add_option("-c", "--coverage", action="store_true", dest="coverage",
                       help="print a coverage report when finished")
-
+    parser.add_option("-i", "--ignored-modules", dest="ignored", default=None,
+                      help="comma separated test moodules to ignore, "
+                      + " e.g: test_gtk.py, test_account.py")
+    
     (options, args) = parser.parse_args()
     if args:
         testpath = args[0]