diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-10-12 16:34:41 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-10-12 16:34:41 +0200 |
commit | 0a14dbfd2d1b7d6b732865bbe18165ed140b9954 (patch) | |
tree | 328d607007fdeeaa8bea4774d631881155eb8eb3 | |
parent | 16ce371cf4d3833810fc623423269fa856a018bb (diff) |
Release lock in NodeRepositoryTest
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java | 4 | ||||
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java index 511d2f988d0..1ab8291d71f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java @@ -187,7 +187,9 @@ public class NodeRepositoryTest { host1 = host1.withFirmwareVerifiedAt(tester.clock().instant()); host1 = host1.with(host1.status().withIncreasedFailCount()); host1 = host1.with(host1.reports().withReport(Report.basicReport("id", Report.Type.HARD_FAIL, tester.clock().instant(), "Test report"))); - tester.nodeRepository().write(host1, tester.nodeRepository().lock(host1)); + try (var lock = tester.nodeRepository().lock(host1)) { + tester.nodeRepository().write(host1, lock); + } tester.nodeRepository().removeRecursively("host1"); // Host 1 is deprovisioned and unwanted properties are cleared diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java index 5b9d6d3e784..9f6f5043ae8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java @@ -7,7 +7,6 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.TenantName; import com.yahoo.text.Utf8; import com.yahoo.vespa.applicationmodel.HostName; -import com.yahoo.vespa.curator.stats.LockStats; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.maintenance.OsUpgradeActivator; import com.yahoo.vespa.hosted.provision.maintenance.TestMetric; @@ -40,7 +39,6 @@ public class NodesV2ApiTest { @Before public void createTester() { - LockStats.clearForTesting(); tester = new RestApiTester(); } |