diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-11-18 14:21:17 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-11-18 14:21:17 +0100 |
commit | 94b5b00ee911f05992573a87e77255f4440a712f (patch) | |
tree | 0d426b2be8ac524d80d56b199f30f68ffb2b8b1d /vespa-osgi-testrunner | |
parent | 40a864437bb2e6d23311120becd89b452d5c3319 (diff) |
Specify directory rather than setting it
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java | 3 | ||||
-rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java index 703dfe6cd1b..47bb5b866a3 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/VespaCliTestRunner.java @@ -110,11 +110,10 @@ public class VespaCliTestRunner implements TestRunner { .flatMap(testsPath -> getChildDirectory(testsPath, toSuiteDirectoryName(suite))) .orElseThrow(() -> new IllegalStateException("No tests found, for suite '" + suite + "'")); - ProcessBuilder builder = new ProcessBuilder("vespa", "test", + ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.toAbsolutePath().toString(), "--application", config.application().toFullString(), "--endpoints", toEndpointsConfig(config)); builder.redirectErrorStream(true); - builder.directory(suitePath.toFile()); return builder; } diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java index 59bb918134a..1bf50a596b9 100644 --- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java +++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/VespaCliTestRunnerTest.java @@ -58,8 +58,7 @@ class VespaCliTestRunnerTest { Path systemTests = Files.createDirectory(tests.resolve("system-test")); ProcessBuilder builder = runner.testRunProcessBuilder(TestRunner.Suite.SYSTEM_TEST, testConfig); - assertEquals(systemTests.toFile(), builder.directory()); - assertEquals(List.of("vespa", "test", + assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(), "--application", "t.a.i", "--endpoints", "{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}"), builder.command()); |