diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-30 07:03:51 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-30 07:05:10 +0000 |
| commit | 2a3890cf71e18decf19a6d5e99ee12eb2dd139a9 (patch) | |
| tree | 90fe1ea3ce7fe4668dd875581ef185fed0a28c12 /uitest | |
| parent | e413646588fe45fe930116210da882b82151f3f3 (diff) | |
| download | vaadin-framework-2a3890cf71e18decf19a6d5e99ee12eb2dd139a9.tar.gz vaadin-framework-2a3890cf71e18decf19a6d5e99ee12eb2dd139a9.zip | |
Revert "Only print testbench failure TeamCity messages when running in TC"
This reverts commit d0e604f6b509767c46ffe0fd6765cf23535f593e.
Change-Id: I14509a9cb1365761d02a3a8a18d3febc4a7ba918
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 8 | ||||
| -rw-r--r-- | uitest/tb3test.xml | 9 | ||||
| -rw-r--r-- | uitest/test.xml | 12 |
3 files changed, 6 insertions, 23 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java index 367229eaaa..565cd4ce34 100644 --- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java @@ -68,11 +68,9 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test { protected void failed(Throwable e, Description description) { // Notify Teamcity of failed test - if (!System.getProperty("teamcity.version", "").equals("")) { - System.out.print("##teamcity[publishArtifacts '"); - System.out.println(getScreenshotErrorBaseName() - + "* => screenshot-errors']"); - } + System.out.print("##teamcity[publishArtifacts '"); + System.out.println(getScreenshotErrorBaseName() + + "* => screenshot-errors']"); } }; diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml index 5285280608..dd0c12db91 100644 --- a/uitest/tb3test.xml +++ b/uitest/tb3test.xml @@ -19,21 +19,12 @@ <target name="run-tb3-suite"> <fail unless="junit.test.suite" message="Define suite to run using junit.test.suite" /> <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" /> - - <!-- Ensure teamcity.version is set to something --> - <condition property="teamcity.version" value=""> - <not> - <isset property="teamcity.version" /> - </not> - </condition> - <junit printsummary="withOutAndErr" fork="yes"> <formatter usefile="false" type="plain" /> <classpath refid="classpath.tb3" /> <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" /> <jvmarg value="-Djava.awt.headless=true" /> - <jvmarg value="-Dteamcity.version=${teamcity.version}" /> <test name="${junit.test.suite}" /> </junit> diff --git a/uitest/test.xml b/uitest/test.xml index 3bfeb66c05..bcb0bf540a 100644 --- a/uitest/test.xml +++ b/uitest/test.xml @@ -134,18 +134,12 @@ </batchtest> </junit> - <antcall target="notify-teamcity-of-build-artifact"> - <param name="file" value="${target}" /> - </antcall> + <!-- Have teamcity publish each test error artifact immediatly if there are any --> + <basename property="basename" file="${target}" suffix="java" /> + <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo> </target> - <!-- Have teamcity publish each test error artifact immediatly if there are any --> - <target name="notify-teamcity-of-build-artifact" if="teamcity.version"> - <basename property="basename" file="${file}" suffix="java" /> - <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo> - </target> - <!-- Remove temporary source and compiled java files --> <target name="remove-temp-testclasses"> <delete failonerror="false"> |