fixing per test failures - upgrading failsafe plugin, removing parall…

…el=false setting for surefire.
Evolveum · Aug 19, 2021 · 6dcf449 · 6dcf449
1 parent 63a998f
commit 6dcf449
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -697,11 +697,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.commons</groupId>
-            <artifactId>test-ng</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.evolveum.icf</groupId>
             <artifactId>dummy-resource</artifactId>
@@ -713,11 +708,16 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <dependency><!-- Not used, but required for surefire plugin not to complain -->
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.commons</groupId>
+            <artifactId>test-ng</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/gui/admin-gui/testng-perf.xml b/gui/admin-gui/testng-perf.xml
@@ -6,7 +6,7 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
-<suite name="integration" parallel="false" verbose="1">
+<suite name="perf" parallel="false" verbose="1">
 
     <test name="Perf testing" preserve-order="true" parallel="false" verbose="10">
         <classes>

diff --git a/pom.xml b/pom.xml
@@ -206,7 +206,7 @@
         <reflections.version>0.9.12</reflections.version>
         <guava.version>30.1.1-jre</guava.version>
         <jcommander.version>1.81</jcommander.version>
-        <failsafe.version>3.0.0-M4</failsafe.version>
+        <failsafe.version>3.0.0-M5</failsafe.version>
         <qpid-broker.version>8.0.4</qpid-broker.version>
         <apache-artemis.version>2.17.0</apache-artemis.version> <!-- matching Spring Boot Artemis dependency -->
         <asm.version>9.1</asm.version>
@@ -1887,7 +1887,7 @@
                         </execution>
                     </executions>
                     <configuration>
-                        <parallel>false</parallel>
+                        <!--<parallel>false</parallel>-->
                         <forkCount>1</forkCount>
                         <reuseForks>true</reuseForks>
                         <redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>