run-tests: remove some legacy code around result handling
authorGregory Szorc <gregory.szorc@gmail.com>
Sun, 20 Apr 2014 17:06:57 -0700
changeset 21489 f245c1fc7e96
parent 21488 feb8ad2d57ee
child 21490 588ebd47cd87
run-tests: remove some legacy code around result handling unittest handles all results now. We no longer need to manually keep track of results.
tests/run-tests.py
--- a/tests/run-tests.py	Sun Apr 20 17:04:42 2014 -0700
+++ b/tests/run-tests.py	Sun Apr 20 17:06:57 2014 -0700
@@ -1220,14 +1220,6 @@
         self.pythondir = None
         self.coveragefile = None
         self.times = [] # Holds execution times of tests.
-        self.results = {
-            '.': [],
-            '!': [],
-            '~': [],
-            's': [],
-            'i': [],
-            'u': [],
-        }
         self.abort = [False]
         self._createdfiles = []
         self._hgpath = None
@@ -1632,7 +1624,7 @@
         def job(test, result):
             try:
                 test(result)
-                done.put(('u', None, None))
+                done.put(None)
             except KeyboardInterrupt:
                 pass
             except: # re-raises
@@ -1643,10 +1635,7 @@
             while tests or running:
                 if not done.empty() or running == jobs or not tests:
                     try:
-                        code, test, msg = done.get(True, 1)
-                        self.results[code].append((test, msg))
-                        if self.options.first and code not in '.si':
-                            break
+                        done.get(True, 1)
                         if result and result.shouldStop:
                             break
                     except queue.Empty: