run-tests: move killdaemons into Test.run()

killdaemons() was the only part of runone() looking at env variables. We
move killdaemons() into Test.run() to enable us to fully move env into
Test.

tests/run-tests.py

@@ -560,7 +560,10 b' class Test(object):'
     def run(self, env):
         createhgrc(env['HGRCPATH'], self._options)
 
-        return self._run(self._replacements, env)
+        try:
+            return self._run(self._replacements, env)
+        finally:
+            killdaemons(env['DAEMON_PIDS'])
 
     def _run(self, replacements, env):
         raise NotImplemented('Subclasses must implement Test.run()')
@@ -1036,8 +1039,6 b' def runone(options, test, count):'
     times.append((test, endtime - starttime))
     vlog("# Ret was:", ret)
 
-    killdaemons(env['DAEMON_PIDS'])
-
     skipped = (ret == SKIPPED_STATUS)
 
     # If we're not in --debug mode and reference output file exists,