fixup! Make the cache manager owned by the TestEnvironment so it can …

…be shut down correctly.
web-platform-tests · Mar 5, 2015 · 492538d · 492538d
1 parent 1d4232b
commit 492538d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wptrunner/browsers/b2g.py b/wptrunner/browsers/b2g.py
@@ -46,12 +46,13 @@ def executor_kwargs(test_type, http_server_url, cache_manager, **kwargs):
     if timeout_multiplier is None:
         timeout_multiplier = 2
 
-    if test_type == "reftest":
-        executor_kwargs["cache_manager"] = cache_manager
-
     executor_kwargs = {"http_server_url": http_server_url,
                        "timeout_multiplier": timeout_multiplier,
                        "close_after_done": False}
+
+    if test_type == "reftest":
+        executor_kwargs["cache_manager"] = cache_manager
+
     return executor_kwargs
 
 

diff --git a/wptrunner/executors/base.py b/wptrunner/executors/base.py
@@ -7,7 +7,6 @@
 import os
 import traceback
 from abc import ABCMeta, abstractmethod
-from multiprocessing import Manager
 
 from ..testrunner import Stop