Fixing web tests: Changing jetty module version. Increasing some timeouts.

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 764d2d78eb351ed5aa30f9c8a15be257f3853b72..61a586c6d8d4afb5490fdcf4c45611c5bf8f44ec 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -560,7 +560,7 @@
           <plugin>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>9.4.5.v20170502</version>
+            <version>${jetty.version}</version>
             <configuration>
               <stopKey>archivastop</stopKey>
               <stopPort>${container.stop.port}</stopPort>
@@ -568,6 +568,9 @@
               <httpConnector>
                 <port>${container.http.port}</port>
               </httpConnector>
+              <supportedPackagings>
+                <supportedPackaging>pom</supportedPackaging>
+              </supportedPackagings>
             </configuration>
             <dependencies>
               <dependency>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
index e33f7df8c43dafe4b19b6c8471900acb616ac2e9..dc2e2d8c7a54c55d64f33ea89261efc59d804671 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
@@ -90,7 +90,7 @@ public class WebDriverBrowseTest
         goTo( url );
 
         // wait until topbar-menu-container is feeded
-        await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
+        await().atMost( 10, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
         await().atMost( 10, TimeUnit.SECONDS).untilPredicate( (fl) -> el("#create-admin-link-a").conditions().clickable() ||
             el("#login-link-a").conditions().clickable()
         );

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
index 0fb067468208e8cf8d565d97163b785faff0fe44..ee0a12f6ee1724bcbb8dff5020dd70b64638a9f7 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
@@ -82,7 +82,7 @@ public class WebDriverTest
 
         // wait until topbar-menu-container is feeded
         //await().atMost(20, TimeUnit.SECONDS).until($("#topbar-menu")).present();
-        await().untilPredicate((fl) ->$("#topbar-menu").present());
+        await().atMost( 10, TimeUnit.SECONDS).untilPredicate((fl) ->$("#topbar-menu").present());
         await().atMost( 10, TimeUnit.SECONDS).untilPredicate( ( fl) -> el("#create-admin-link-a").conditions().clickable() ||
             el("#login-link-a").conditions().clickable()
         );