diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-08-20 13:43:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 13:43:20 +0200 |
| commit | e95f9418f8dd5cf163fbbe4b802f8e4480f9a4c7 (patch) | |
| tree | 50602c4e7339d154c6a55cd25a931c13d79789ac /vespa-testrunner-components | |
| parent | 8c68a8a6977a35a8a2dfe5d063daabe3c0217737 (diff) | |
| parent | 22b9c87669181c71c96809bc2a25934392ebcaef (diff) | |
Merge pull request #10312 from vespa-engine/jvenstad/test-categories-simplification
Jvenstad/test categories simplification
Diffstat (limited to 'vespa-testrunner-components')
4 files changed, 5 insertions, 12 deletions
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java index 4ebabe63c1d..0233e4db2bb 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java @@ -68,10 +68,6 @@ public class PomXmlGenerator { "%DEPENDENCIES_TO_SCAN%" + " </dependenciesToScan>\n" + " <groups>%GROUPS%</groups>\n" + - " <excludedGroups>com.yahoo.vespa.tenant.systemtest.base.impl.EmptyExcludeGroup.class</excludedGroups>\n" + - " <excludes>\n" + - " <exclude>%GROUPS%</exclude>\n" + - " </excludes>\n" + " <reportsDirectory>${env.TEST_DIR}</reportsDirectory>\n" + " <redirectTestOutputToFile>false</redirectTestOutputToFile>\n" + " <trimStackTrace>false</trimStackTrace>\n" + diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java index 018acb17387..1507891e69b 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/TestProfile.java @@ -6,9 +6,9 @@ package com.yahoo.vespa.hosted.testrunner; */ enum TestProfile { - SYSTEM_TEST("ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true), - STAGING_TEST("ai.vespa.hosted.cd.StagingTest, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true), - PRODUCTION_TEST("ai.vespa.hosted.cd.ProductionTest, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false); + SYSTEM_TEST("system, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true), + STAGING_TEST("staging, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true), + PRODUCTION_TEST("production, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false); private final String group; private final boolean failIfNoTests; diff --git a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java index dce02922c63..ef8df2b748b 100644 --- a/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java +++ b/vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java @@ -30,4 +30,5 @@ public class PomXmlGeneratorTest { String expected = IOUtils.toString(this.getClass().getResourceAsStream(resourceFile)); assertEquals(resourceFile, expected, actual); } + }
\ No newline at end of file diff --git a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests index 263bd27a4f3..7c986560c17 100644 --- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests +++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests @@ -53,11 +53,7 @@ <dependenciesToScan> <dependency>com.yahoo.vespa.testrunner.test:main.jar</dependency> </dependenciesToScan> - <groups>ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</groups> - <excludedGroups>com.yahoo.vespa.tenant.systemtest.base.impl.EmptyExcludeGroup.class</excludedGroups> - <excludes> - <exclude>ai.vespa.hosted.cd.SystemTest, com.yahoo.vespa.tenant.systemtest.base.SystemTest</exclude> - </excludes> + <groups>system, com.yahoo.vespa.tenant.systemtest.base.SystemTest</groups> <reportsDirectory>${env.TEST_DIR}</reportsDirectory> <redirectTestOutputToFile>false</redirectTestOutputToFile> <trimStackTrace>false</trimStackTrace> |