Override cleanup distributed fixture, and reconfigure dask-jobqueue w…

…hen called

conftest.py

@@ -1,10 +1,11 @@
 # content of conftest.py
 
 # Make loop fixture available in all tests
-from distributed.utils_test import loop, cleanup  # noqa: F401
+from distributed.utils_test import loop  # noqa: F401
 
 import pytest
 
+import dask_jobqueue.config
 import dask_jobqueue.lsf
 import dask
 
@@ -88,6 +89,13 @@ def mock_lsf_version(monkeypatch, request):
     "htcondor": HTCondorCluster,
 }
 
+# We override cleanup method from distributed that has been added to the loop
+# fixture, because it just wipe the Main Loop in our tests.
+@pytest.fixture
+def cleanup():
+    dask_jobqueue.config.reconfigure()
+    yield
+
 
 @pytest.fixture(
     params=[pytest.param(v, marks=[pytest.mark.env(k)]) for (k, v) in all_envs.items()]

dask_jobqueue/config.py

@@ -3,10 +3,15 @@
 import dask
 import yaml
 
-fn = os.path.join(os.path.dirname(__file__), "jobqueue.yaml")
-dask.config.ensure_file(source=fn)
 
-with open(fn) as f:
-    defaults = yaml.safe_load(f)
+def reconfigure():
+    fn = os.path.join(os.path.dirname(__file__), "jobqueue.yaml")
+    dask.config.ensure_file(source=fn)
 
-dask.config.update(dask.config.config, defaults, priority="old")
+    with open(fn) as f:
+        defaults = yaml.safe_load(f)
+
+    dask.config.update_defaults(defaults)
+
+
+reconfigure()