From faeb8e3dfb54d726e22e3e5b0539a894a50e626b Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Mon, 6 Jun 2022 10:04:21 +0100
Subject: [PATCH 1/2] set cluster name via constructor

Fixes #516
---
 dask_kubernetes/experimental/kubecluster.py | 3 +--
 dask_kubernetes/helm/helmcluster.py         | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dask_kubernetes/experimental/kubecluster.py b/dask_kubernetes/experimental/kubecluster.py
index 9c928a51a..b97f988be 100644
--- a/dask_kubernetes/experimental/kubecluster.py
+++ b/dask_kubernetes/experimental/kubecluster.py
@@ -133,7 +133,6 @@ def __init__(
         shutdown_on_close=None,
         **kwargs,
     ):
-        self.name = name
         self.namespace = namespace or namespace_default()
         self.image = image
         self.n_workers = n_workers
@@ -146,7 +145,7 @@ def __init__(
 
         self._instances.add(self)
 
-        super().__init__(**kwargs)
+        super().__init__(name=name, **kwargs)
         if not self.asynchronous:
             self._loop_runner.start()
             self.sync(self._start)
diff --git a/dask_kubernetes/helm/helmcluster.py b/dask_kubernetes/helm/helmcluster.py
index 1b15618bb..ed667fc0e 100644
--- a/dask_kubernetes/helm/helmcluster.py
+++ b/dask_kubernetes/helm/helmcluster.py
@@ -89,11 +89,13 @@ def __init__(
         worker_name="worker",
         node_host=None,
         node_port=None,
+        name=None,
         **kwargs,
     ):
         self.release_name = release_name
         self.namespace = namespace or namespace_default()
-        self.name = self.release_name + "." + self.namespace
+        if name is None:
+            name = self.release_name + "." + self.namespace
         check_dependency("helm")
         check_dependency("kubectl")
         status = subprocess.run(
@@ -113,7 +115,7 @@ def __init__(
         self.node_host = node_host
         self.node_port = node_port
 
-        super().__init__(**kwargs)
+        super().__init__(name=name, **kwargs)
         if not self.asynchronous:
             self._loop_runner.start()
             self.sync(self._start)

From 6f04d5e24d363d483d5ec98c83bb2dd235d76c59 Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Mon, 6 Jun 2022 10:25:59 +0100
Subject: [PATCH 2/2] avoid capturing subprocess output when it's unused

pytest should capture the output with capfd so we can see
the log when interrupted by pytest-timeout
---
 dask_kubernetes/conftest.py             |  6 ++++--
 dask_kubernetes/helm/tests/test_helm.py | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dask_kubernetes/conftest.py b/dask_kubernetes/conftest.py
index 7adf3509c..cdb98fd88 100644
--- a/dask_kubernetes/conftest.py
+++ b/dask_kubernetes/conftest.py
@@ -24,7 +24,7 @@ def kopf_runner(k8s_cluster):
 @pytest.fixture(scope="session")
 def docker_image():
     image_name = "dask-kubernetes:dev"
-    subprocess.check_output(["docker", "build", "-t", image_name, "./ci/"])
+    subprocess.run(["docker", "build", "-t", image_name, "./ci/"], check=True)
     return image_name
 
 
@@ -40,7 +40,9 @@ def k8s_cluster(kind_cluster, docker_image):
 def install_istio(k8s_cluster):
     if bool(os.environ.get("TEST_ISTIO", False)):
         check_dependency("istioctl")
-        subprocess.check_output(["istioctl", "install", "--set", "profile=demo", "-y"])
+        subprocess.run(
+            ["istioctl", "install", "--set", "profile=demo", "-y"], check=True
+        )
         k8s_cluster.kubectl(
             "label", "namespace", "default", "istio-injection=enabled", "--overwrite"
         )
diff --git a/dask_kubernetes/helm/tests/test_helm.py b/dask_kubernetes/helm/tests/test_helm.py
index 3bd9ebf08..b7bf44464 100644
--- a/dask_kubernetes/helm/tests/test_helm.py
+++ b/dask_kubernetes/helm/tests/test_helm.py
@@ -21,10 +21,10 @@
 @pytest.fixture(scope="session")
 def chart_repo():
     repo_name = "dask"
-    subprocess.check_output(
-        ["helm", "repo", "add", repo_name, "https://helm.dask.org/"]
+    subprocess.run(
+        ["helm", "repo", "add", repo_name, "https://helm.dask.org/"], check=True
     )
-    subprocess.check_output(["helm", "repo", "update"])
+    subprocess.run(["helm", "repo", "update"], check=True)
     return repo_name
 
 
@@ -51,7 +51,7 @@ def test_namespace():
 
 @pytest.fixture(scope="session")  # Creating this fixture is slow so we should reuse it.
 def release(k8s_cluster, chart_name, test_namespace, release_name, config_path):
-    subprocess.check_output(
+    subprocess.run(
         [
             "helm",
             "install",
@@ -63,10 +63,11 @@ def release(k8s_cluster, chart_name, test_namespace, release_name, config_path):
             "--wait",
             "-f",
             config_path,
-        ]
+        ],
+        check=True,
     )
     # Scale back the additional workers group for now
-    subprocess.check_output(
+    subprocess.run(
         [
             "kubectl",
             "scale",
@@ -75,10 +76,11 @@ def release(k8s_cluster, chart_name, test_namespace, release_name, config_path):
             "deployment",
             f"{release_name}-dask-worker-foo",
             "--replicas=0",
-        ]
+        ],
+        check=True,
     )
     yield release_name
-    subprocess.check_output(["helm", "delete", "-n", test_namespace, release_name])
+    subprocess.run(["helm", "delete", "-n", test_namespace, release_name], check=True)
 
 
 @pytest_asyncio.fixture