LRQA-46522 Reduce Faces test timeout

GergoMathe · Feb 1, 2019 · 97c316e · 97c316e
1 parent f12c4d4
commit 97c316e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/build-test-batch.xml b/build-test-batch.xml
@@ -4284,7 +4284,7 @@ log.sanitizer.enabled=false</echo>
 						</execute>
 
 						<execute dir="${liferay.faces.bridge.impl.dir}/tck/bridge-tck-main-portlet" failonerror="false">
-							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 
 						<!--
@@ -4360,7 +4360,7 @@ log.sanitizer.enabled=false</echo>
 						</execute>
 
 						<execute dir="${liferay.faces.bridge.impl.dir}/test/integration" failonerror="false">
-							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 
 						<!--
@@ -4374,7 +4374,7 @@ log.sanitizer.enabled=false</echo>
 						/>
 
 						<execute dir="${liferay.faces.bridge.impl.dir}/test/integration" failonerror="false">
-							mvn verify -P selenium-alloy-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium-alloy-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 
 						<!--
@@ -4388,15 +4388,15 @@ log.sanitizer.enabled=false</echo>
 						/>
 
 						<execute dir="${liferay.faces.bridge.impl.dir}/test/integration" failonerror="false">
-							mvn verify -P selenium-jsf-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium-jsf-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 
 						<execute dir="${liferay.faces.portal.dir}/test/integration">
 							mvn clean install --quiet
 						</execute>
 
 						<execute dir="${liferay.faces.portal.dir}/test/integration" failonerror="false">
-							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 
 						<!--
@@ -4410,7 +4410,7 @@ log.sanitizer.enabled=false</echo>
 						/>
 
 						<execute dir="${liferay.faces.portal.dir}/test/integration" failonerror="false">
-							mvn verify -P selenium-portal-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=300
+							mvn verify -P selenium-portal-showcase,firefox -Dwebdriver.firefox.bin=${browser.firefox.bin.file} -Dintegration.browser.driver.wait.time.out=${liferay.faces.test.timeout}
 						</execute>
 					</test-action>
 				</database-test-run-test>

diff --git a/test.properties b/test.properties
@@ -738,6 +738,7 @@
     liferay.faces.bridge.impl.dir=../liferay-faces-bridge-impl
     liferay.faces.portal.dir=../liferay-faces-portal
     liferay.faces.showcase.dir=../liferay-faces-showcase
+    liferay.faces.test.timeout=30
 
 ##
 ## Liferay Plugins