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

dotCMS · May 17, 2017 · 2a54310 · 2a54310
1 parent 84ef054
commit 2a54310
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/dotCMS/build-aws-tests.sh b/dotCMS/build-aws-tests.sh
@@ -100,23 +100,23 @@ mkdir tests
 mkdir tests/logs
 
 # Run Functional tests
-#ant -f build-tests.xml test-dotcms
-#if [ ! -d "dotserver/tomcat/webapps/ROOT/dotsecure/logs/test" ]; then
-#	echo 'Functional tests could not be run'
-#
-#	exit 1;
-#fi
+ant -f build-tests.xml test-dotcms
+if [ ! -d "dotserver/tomcat/webapps/ROOT/dotsecure/logs/test" ]; then
+	echo 'Functional tests could not be run'
+
+	exit 1;
+fi
 
 # Copy results and logs of tests
-#cp dotserver/tomcat/webapps/ROOT/dotsecure/logs/test/*.xml tests
-#cp dotserver/tomcat/webapps/ROOT/dotsecure/logs/*.log tests/logs
-#cp dotserver/tomcat/logs/* tests/logs
+cp dotserver/tomcat/webapps/ROOT/dotsecure/logs/test/*.xml tests
+cp dotserver/tomcat/webapps/ROOT/dotsecure/logs/*.log tests/logs
+cp dotserver/tomcat/logs/* tests/logs
 
 # Run Integration tests
-#cd core/dotCMS
-#./gradlew integrationTest -PdatabaseType=$DB_TYPE --no-daemon  || true
-#cd ../..
-#cp core/dotCMS/build/test-results/integrationTest/*.xml tests
+cd core/dotCMS
+./gradlew integrationTest -PdatabaseType=$DB_TYPE --no-daemon  || true
+cd ../..
+cp core/dotCMS/build/test-results/integrationTest/*.xml tests
 
 
 # Create output zip file

diff --git a/dotCMS/src/functional-test/resources/build-tests.xml b/dotCMS/src/functional-test/resources/build-tests.xml
@@ -26,7 +26,7 @@
     <!-- Main test target, this tasks will run all the unit tests of the application -->
     <target name="test-dotcms">
         <runservertests
-                testurl="http://localhost:8080"
+                testurl="http://localhost:8080/dotAdmin/"
                 starttarget="tomcat-start"
                 stoptarget="tomcat-stop"
                 testtarget="test-all-junits"