Close executor in test code

1 files changed, 7 insertions, 2 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
index 7c2009255cb..989a7c31821 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
@@ -236,8 +236,13 @@ public class DeploymentContext {
     /** Flush count pending DNS updates */
     public DeploymentContext flushDnsUpdates(int count) {
         var dispatcher = new NameServiceDispatcher(tester.controller(), Duration.ofSeconds(count));
-        dispatcher.run();
-        return this;
+        try {
+            dispatcher.run();
+            return this;
+        }
+        finally {
+            dispatcher.shutdown();
+        }
     }
 
     /** Add a routing policy for this in given zone, with status set to inactive */