Restructure travis tests

8 files changed, 66 insertions, 58 deletions

diff --git a/.travis.yml b/.travis.yml
index c599a0c192b..3f80fdb8458 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,12 +25,14 @@ before_install:
 
 install:
   - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi"
+  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/install.sh; fi"
+
 
 script:
   - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
   - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
 
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC.sh; fi"
+  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/script.sh; fi"
 
 matrix:
   include:
diff --git a/apps/dav/tests/travis/carddavtester.sh b/apps/dav/tests/travis/carddavtester.sh
deleted file mode 100644
index 17f7e8eb4a8..00000000000
--- a/apps/dav/tests/travis/carddavtester.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
-
-
-# start the server
-php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../.." &
-
-
-if [ ! -f CalDAVTester/run.py ]; then
-	cd "$SCRIPTPATH"
-    git clone https://github.com/DeepDiver1975/CalDAVTester.git
-	cd "$SCRIPTPATH/CalDAVTester"
-    python run.py -s
-	cd "$SCRIPTPATH"
-fi
-
-# create test user
-cd "$SCRIPTPATH/../../../../"
-OC_PASS=user01 php occ user:add --password-from-env user01
-php occ dav:create-addressbook user01 addressbook
-OC_PASS=user02 php occ user:add --password-from-env user02
-php occ dav:create-addressbook user02 addressbook
-cd "$SCRIPTPATH/../../../../"
-
-# run the tests
-cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail -s "$SCRIPTPATH/caldavtest/config/serverinfo.xml" -o cdt.txt \
-	"$SCRIPTPATH/caldavtest/tests/CardDAV/current-user-principal.xml" \
-	"$SCRIPTPATH/caldavtest/tests/CardDAV/sync-report.xml"
-RESULT=$?
-
-tail "$SCRIPTPATH/../../../../data-autotest/owncloud.log"
-
-exit $RESULT
diff --git a/apps/dav/tests/travis/carddavtester/install.sh b/apps/dav/tests/travis/carddavtester/install.sh
new file mode 100644
index 00000000000..fa5d141ce0d
--- /dev/null
+++ b/apps/dav/tests/travis/carddavtester/install.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+
+if [ ! -f CalDAVTester/run.py ]; then
+	cd "$SCRIPTPATH"
+    git clone https://github.com/DeepDiver1975/CalDAVTester.git
+	cd "$SCRIPTPATH/CalDAVTester"
+    python run.py -s
+	cd "$SCRIPTPATH"
+fi
+
+# create test user
+cd "$SCRIPTPATH/../../../../../"
+OC_PASS=user01 php occ user:add --password-from-env user01
+php occ dav:create-addressbook user01 addressbook
+OC_PASS=user02 php occ user:add --password-from-env user02
+php occ dav:create-addressbook user02 addressbook
+cd "$SCRIPTPATH/../../../../../"
diff --git a/apps/dav/tests/travis/carddavtester/script.sh b/apps/dav/tests/travis/carddavtester/script.sh
new file mode 100644
index 00000000000..6edd92981e1
--- /dev/null
+++ b/apps/dav/tests/travis/carddavtester/script.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+# start the server
+php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../../.." &
+
+# run the tests
+cd "$SCRIPTPATH/CalDAVTester"
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onfail -s "$SCRIPTPATH/../caldavtest/config/serverinfo.xml" -o cdt.txt \
+	"$SCRIPTPATH/../caldavtest/tests/CardDAV/current-user-principal.xml" \
+	"$SCRIPTPATH/../caldavtest/tests/CardDAV/sync-report.xml"
+RESULT=$?
+
+tail "$/../../../../../data-autotest/owncloud.log"
+
+exit $RESULT
diff --git a/apps/dav/tests/travis/litmus-v1.sh b/apps/dav/tests/travis/litmus-v1/install.sh
index ab0690f392e..0ee2cb08d82 100644
--- a/apps/dav/tests/travis/litmus-v1.sh
+++ b/apps/dav/tests/travis/litmus-v1/install.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
-
-
-# start the server
-php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../.." &
-
 
 # compile litmus
 if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then
@@ -17,7 +10,3 @@ if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then
   ./configure
   make
 fi
-
-# run the tests
-cd /tmp/litmus/litmus-0.13
-make URL=http://127.0.0.1:8888/remote.php/webdav CREDS="admin admin" TESTS="basic copymove props locks" check
diff --git a/apps/dav/tests/travis/litmus-v1/script.sh b/apps/dav/tests/travis/litmus-v1/script.sh
new file mode 100644
index 00000000000..cba305683b2
--- /dev/null
+++ b/apps/dav/tests/travis/litmus-v1/script.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+
+# start the server
+php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../../.." &
+
+sleep 30
+
+# run the tests
+cd /tmp/litmus/litmus-0.13
+make URL=http://127.0.0.1:8888/remote.php/webdav CREDS="admin admin" TESTS="basic copymove props locks" check
diff --git a/apps/dav/tests/travis/litmus-v2.sh b/apps/dav/tests/travis/litmus-v2/install.sh
index 892ad327d3b..0ee2cb08d82 100644
--- a/apps/dav/tests/travis/litmus-v2.sh
+++ b/apps/dav/tests/travis/litmus-v2/install.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
-
-
-# start the server
-php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../.." &
-
 
 # compile litmus
 if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then
@@ -17,7 +10,3 @@ if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then
   ./configure
   make
 fi
-
-# run the tests
-cd /tmp/litmus/litmus-0.13
-make URL=http://127.0.0.1:8888/remote.php/dav/files/admin CREDS="admin admin" TESTS="basic copymove props locks" check
diff --git a/apps/dav/tests/travis/litmus-v2/script.sh b/apps/dav/tests/travis/litmus-v2/script.sh
new file mode 100644
index 00000000000..966ed5a2052
--- /dev/null
+++ b/apps/dav/tests/travis/litmus-v2/script.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+
+# start the server
+php -S 127.0.0.1:8888 -t "$SCRIPTPATH/../../../../.." &
+
+sleep 30
+
+# run the tests
+cd /tmp/litmus/litmus-0.13
+make URL=http://127.0.0.1:8888/remote.php/dav/files/admin CREDS="admin admin" TESTS="basic copymove props locks" check