Revert "Only print testbench failure TeamCity messages when running in TC"

This reverts commit d0e604f6b509767c46ffe0fd6765cf23535f593e.

Change-Id: I14509a9cb1365761d02a3a8a18d3febc4a7ba918

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 367229eaaa177753fec8b073c39785b828cbdd6e..565cd4ce348d2e0c6539b96e6c1d8ed82ca003d4 100644 (file)
--- 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 5285280608fc6075679828ce430ac20c289e6029..dd0c12db916f39ccc1031f62b3a14f4681403e2e 100644 (file)
--- 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 3bfeb66c05a32d2042c6407c305ac3202882e137..bcb0bf540a3bd5d5e9d759bfcde30cdeeec8f981 100644 (file)
--- 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">