tests/run-tests.py

--- a/tests/run-tests.py	Tue May 30 20:47:00 2017 -0400
+++ b/tests/run-tests.py	Tue May 30 20:48:43 2017 -0400
@@ -1778,10 +1778,11 @@
             except: # re-raises
                 done.put(('!', test, 'run-test raised an error, see traceback'))
                 raise
-            try:
-                channels[channel] = ''
-            except IndexError:
-                pass
+            finally:
+                try:
+                    channels[channel] = ''
+                except IndexError:
+                    pass
 
         def stat():
             count = 0