#11196: Trying to fix functional-tests for MSSQL and Oracle (2)

dotCMS · May 17, 2017 · 172e84b · 172e84b
1 parent 7482b62
commit 172e84b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dotCMS/build-aws-tests.sh b/dotCMS/build-aws-tests.sh
@@ -99,8 +99,12 @@ felix.base.dir=$PWD/dotserver/tomcat/webapps/ROOT/WEB-INF/felix
 mkdir tests
 mkdir tests/logs
 
-# Run End-2-End tests
+# Run Functional tests
 ant -f build-tests.xml test-dotcms
+if [ ! -d "dotserver/tomcat/webapps/ROOT/dotsecure/logs/test" ]; then
+	# Retry if could not be run
+	ant -f build-tests.xml test-dotcms
+fi
 
 # Copy results and logs of tests
 cp dotserver/tomcat/webapps/ROOT/dotsecure/logs/test/*.xml tests

diff --git a/dotCMS/src/functional-test/resources/build-tests.xml b/dotCMS/src/functional-test/resources/build-tests.xml
@@ -30,7 +30,7 @@
                 starttarget="tomcat-start"
                 stoptarget="tomcat-stop"
                 testtarget="test-all-junits"
-                timeout="1200000"/>
+                timeout="900000"/>
     </target>
 
     <!-- Hit the tests servlet to run all the unit tests of the application -->