Expect tests in tests directory

2 files changed, 16 insertions, 13 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 06df43be6a4..cd5c109850b 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
@@ -39,15 +39,17 @@ public class VespaCliTestRunner implements TestRunner {
 
     private final SortedMap<Long, LogRecord> log = new ConcurrentSkipListMap<>();
     private final Path artifactsPath;
-    private AtomicReference<Status> status = new AtomicReference<>(Status.NOT_STARTED);
+    private final Path testsPath;
+    private final AtomicReference<Status> status = new AtomicReference<>(Status.NOT_STARTED);
 
     @Inject
     public VespaCliTestRunner(VespaCliTestRunnerConfig config) {
-        this(config.artifactsPath());
+        this(config.artifactsPath(), config.testsPath());
     }
 
-    VespaCliTestRunner(Path artifactsPath) {
+    VespaCliTestRunner(Path artifactsPath, Path testsPath) {
         this.artifactsPath = artifactsPath;
+        this.testsPath = testsPath;
     }
 
     @Override
@@ -70,7 +72,8 @@ public class VespaCliTestRunner implements TestRunner {
 
     @Override
     public boolean isSupported() {
-        return getChildDirectory(artifactsPath, "tests").isPresent();
+        return Stream.of(Suite.SYSTEM_TEST, Suite.STAGING_SETUP_TEST, Suite.STAGING_TEST)
+                     .anyMatch(suite -> getChildDirectory(testsPath, toSuiteDirectoryName(suite)).isPresent());
     }
 
     void runTests(Suite suite, byte[] config) {
@@ -97,8 +100,7 @@ public class VespaCliTestRunner implements TestRunner {
     }
 
     ProcessBuilder testRunProcessBuilder(Suite suite, TestConfig config) throws IOException {
-        Path suitePath = getChildDirectory(artifactsPath, "tests")
-                .flatMap(testsPath -> getChildDirectory(testsPath, toSuiteDirectoryName(suite)))
+        Path suitePath = getChildDirectory(testsPath, toSuiteDirectoryName(suite))
                 .orElseThrow(() -> new IllegalStateException("No tests found, for suite '" + suite + "'"));
 
         ProcessBuilder builder = new ProcessBuilder("vespa", "test", suitePath.toAbsolutePath().toString(),
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 678463b4d8c..d7d8a29c933 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
@@ -44,16 +44,17 @@ class VespaCliTestRunnerTest {
     void testSetup() throws IOException {
         Path temp = Files.createTempDirectory("vespa-cli-test-runner-test-");
         temp.toFile().deleteOnExit();
-        VespaCliTestRunner runner = new VespaCliTestRunner(temp);
+        Path tests = Files.createDirectory(temp.resolve("tests"));
+        Path artifacts = Files.createDirectory(temp.resolve("artifacts"));
+        VespaCliTestRunner runner = new VespaCliTestRunner(artifacts, tests);
         assertFalse(runner.isSupported());
 
-        Path tests = Files.createDirectory(temp.resolve("tests"));
+        Path systemTests = Files.createDirectory(tests.resolve("system-test"));
         assertTrue(runner.isSupported());
         IllegalStateException ise = assertThrows(IllegalStateException.class,
-                                                 () -> runner.testRunProcessBuilder(TestRunner.Suite.SYSTEM_TEST, testConfig));
-        assertEquals("No tests found, for suite 'SYSTEM_TEST'", ise.getMessage());
+                                                 () -> runner.testRunProcessBuilder(TestRunner.Suite.STAGING_TEST, testConfig));
+        assertEquals("No tests found, for suite 'STAGING_TEST'", ise.getMessage());
 
-        Path systemTests = Files.createDirectory(tests.resolve("system-test"));
         ProcessBuilder builder = runner.testRunProcessBuilder(TestRunner.Suite.SYSTEM_TEST, testConfig);
         assertEquals(List.of("vespa", "test", systemTests.toAbsolutePath().toString(),
                              "--application", "t.a.i",
@@ -61,9 +62,9 @@ class VespaCliTestRunnerTest {
                      builder.command());
         assertEquals("{\"endpoints\":[{\"cluster\":\"default\",\"url\":\"https://dev.endpoint:443/\"}]}",
                      builder.environment().get("VESPA_CLI_ENDPOINTS"));
-        assertEquals(temp.resolve("key").toAbsolutePath().toString(),
+        assertEquals(artifacts.resolve("key").toAbsolutePath().toString(),
                      builder.environment().get("VESPA_CLI_DATA_PLANE_KEY_FILE"));
-        assertEquals(temp.resolve("cert").toAbsolutePath().toString(),
+        assertEquals(artifacts.resolve("cert").toAbsolutePath().toString(),
                      builder.environment().get("VESPA_CLI_DATA_PLANE_CERT_FILE"));
     }