diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-01-20 18:49:42 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-01-20 18:49:42 +0100 |
| commit | fd76848d46bcaf5123c1be3a4eb01da0bdcd78de (patch) | |
| tree | 06dd8c2a16306ac8167cbb97692449d1a75350af /archiva-modules/archiva-web | |
| parent | bc013fa0e4d3069300b1676e4bdee97821f782c8 (diff) | |
| download | archiva-fd76848d46bcaf5123c1be3a4eb01da0bdcd78de.tar.gz archiva-fd76848d46bcaf5123c1be3a4eb01da0bdcd78de.zip | |
Fixing web tests: Changing jetty module version. Increasing some timeouts.
Diffstat (limited to 'archiva-modules/archiva-web')
3 files changed, 6 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index 764d2d78e..61a586c6d 100644 --- 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 e33f7df8c..dc2e2d8c7 100644 --- 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 0fb067468..ee0a12f6e 100644 --- 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() ); |