summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-03-14 12:07:44 +0100
committerMartin Polden <mpolden@mpolden.no>2018-03-14 12:07:44 +0100
commit26e1e1723f3796b4e9afd3fce10ea4f756a08550 (patch)
treeb9a5b7a28ceee38cae6b444f97952a228aea2914 /controller-server
parent02f13f889ff02ebc05c3f94763eb34a249fd6191 (diff)
Fix unstable test
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 7b0ca7cb618..4d3f26d247e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -21,6 +21,8 @@ import org.junit.Test;
import org.mockito.Mockito;
import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.time.Clock;
import java.time.Instant;
import java.time.ZoneId;
@@ -40,6 +42,8 @@ import static org.mockito.Mockito.when;
*/
public class MetricsReporterTest {
+ private static final Path testData = Paths.get("src/test/resources/");
+
@Test
public void test_chef_metrics() throws IOException {
ControllerTester tester = new ControllerTester();
@@ -108,7 +112,7 @@ public class MetricsReporterTest {
Chef client = Mockito.mock(Chef.class);
PartialNodeResult result = new ObjectMapper()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
- .readValue(getClass().getClassLoader().getResource("chef_output.json"), PartialNodeResult.class);
+ .readValue(testData.resolve("chef_output.json").toFile(), PartialNodeResult.class);
when(client.partialSearchNodes(anyString(), anyListOf(AttributeMapping.class))).thenReturn(result);
Clock clock = Clock.fixed(Instant.ofEpochSecond(1475497913), ZoneId.systemDefault());