Bug 1050511 - Log skipped tests in a marionette run only after logging suite_start.;r=jgraham
authorChris Manchester <cmanchester@mozilla.com>
Fri, 08 Aug 2014 12:02:39 +0100
changeset 198599 c5531819433cdda597295f515cfd45a0c70d1b97
parent 198598 b211e25454e0c346bc1827e7b63903dbd4dce2ad
child 198600 eb43ad3f7e0bd9073a95c109b08669a8e5dc0950
push id27278
push userkwierso@gmail.com
push dateFri, 08 Aug 2014 21:34:41 +0000
treeherdermozilla-central@a6424bfa8f39 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1050511
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1050511 - Log skipped tests in a marionette run only after logging suite_start.;r=jgraham
testing/marionette/client/marionette/runner/base.py
--- a/testing/marionette/client/marionette/runner/base.py
+++ b/testing/marionette/client/marionette/runner/base.py
@@ -651,16 +651,24 @@ class BaseMarionetteTestRunner(object):
             self.logger.info("starting httpd")
             self.start_httpd(need_external_ip)
 
         for test in tests:
             self.add_test(test)
 
         self.logger.suite_start(self.tests)
 
+        for test in self.manifest_skipped_tests:
+            name = os.path.basename(test['path'])
+            self.logger.test_start(name)
+            self.logger.test_end(name,
+                                 'SKIP',
+                                 message=test['disabled'])
+            self.todo += 1
+
         counter = self.repeat
         while counter >=0:
             round = self.repeat - counter
             if round > 0:
                 self.logger.info('\nREPEAT %d\n-------' % round)
             self.run_test_sets()
             counter -= 1
 
@@ -757,23 +765,16 @@ class BaseMarionetteTestRunner(object):
                 del testargs['oop']
 
             target_tests = manifest.get(tests=unfiltered_tests, **testargs)
             for test in unfiltered_tests:
                 if test['path'] not in [x['path'] for x in target_tests]:
                     test.setdefault('disabled', 'filtered by type (%s)' % self.type)
                     self.manifest_skipped_tests.append(test)
 
-            for test in self.manifest_skipped_tests:
-                self.logger.test_start(os.path.basename(test['path']))
-                self.logger.test_end(os.path.basename(test['path']),
-                                     'SKIP',
-                                     message=test['disabled'])
-                self.todo += 1
-
             for i in target_tests:
                 if not os.path.exists(i["path"]):
                     raise IOError("test file: %s does not exist" % i["path"])
 
                 # manifest_oop is either 'false', 'true' or 'both'.  Anything
                 # else implies 'false'.
                 manifest_oop = i.get('oop', 'false')