summaryrefslogtreecommitdiffstats
path: root/vespa-testrunner-components
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-08-16 16:01:29 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-08-16 16:01:29 +0200
commit4dc0a0800992ce34667712445c8c99550e605cc1 (patch)
treeb29b92638c312656c81c658e610b55a74fad3406 /vespa-testrunner-components
parent92832bbb4e7d32258448bd76cb320a7190456ae2 (diff)
Excludes no longer necessary with separate test jar
Diffstat (limited to 'vespa-testrunner-components')
-rw-r--r--vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java3
-rw-r--r--vespa-testrunner-components/src/test/java/com/yahoo/vespa/hosted/testrunner/PomXmlGeneratorTest.java1
-rw-r--r--vespa-testrunner-components/src/test/resources/pom.xml_system_tests3
3 files changed, 1 insertions, 6 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..a18b943c73b 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
@@ -69,9 +69,6 @@ public class PomXmlGenerator {
" </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/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..267b0e09ddd 100644
--- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
+++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests
@@ -55,9 +55,6 @@
</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>
<reportsDirectory>${env.TEST_DIR}</reportsDirectory>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>