# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2014-04-20 23:17:18
# Node ID c42219733f303290d3446fd692243a49d21ef8b1
# Parent  12dd94e3210277756eae09e4e2fb822f3d99a02e

run-tests: don't print results in unittest mode

A subsequent patch will have unittest print tests for us. Don't perform
old-style printing when in unittest mode.

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1315,6 +1315,9 @@ class TestRunner(object):
             tests = [self._gettest(t, i, asunit=self.options.unittest)
                      for i, t in enumerate(tests)]
 
+            failed = False
+            warned = False
+
             if self.options.unittest:
                 suite = TestSuite(self, tests=tests)
                 verbosity = 1
@@ -1325,27 +1328,27 @@ class TestRunner(object):
             else:
                 self._executetests(tests)
 
-            failed = len(self.results['!'])
-            warned = len(self.results['~'])
-            tested = len(self.results['.']) + failed + warned
-            skipped = len(self.results['s'])
-            ignored = len(self.results['i'])
+                failed = len(self.results['!'])
+                warned = len(self.results['~'])
+                tested = len(self.results['.']) + failed + warned
+                skipped = len(self.results['s'])
+                ignored = len(self.results['i'])
 
-            print
-            if not self.options.noskips:
-                for s in self.results['s']:
-                    print "Skipped %s: %s" % s
-            for s in self.results['~']:
-                print "Warned %s: %s" % s
-            for s in self.results['!']:
-                print "Failed %s: %s" % s
-            self._checkhglib("Tested")
-            print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
-                tested, skipped + ignored, warned, failed)
-            if self.results['!']:
-                print 'python hash seed:', os.environ['PYTHONHASHSEED']
-            if self.options.time:
-                self._outputtimes()
+                print
+                if not self.options.noskips:
+                    for s in self.results['s']:
+                        print "Skipped %s: %s" % s
+                for s in self.results['~']:
+                    print "Warned %s: %s" % s
+                for s in self.results['!']:
+                    print "Failed %s: %s" % s
+                self._checkhglib("Tested")
+                print "# Ran %d tests, %d skipped, %d warned, %d failed." % (
+                    tested, skipped + ignored, warned, failed)
+                if self.results['!']:
+                    print 'python hash seed:', os.environ['PYTHONHASHSEED']
+                if self.options.time:
+                    self._outputtimes()
 
             if self.options.anycoverage:
                 self._outputcoverage()