aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-08-19 12:16:24 +0200
committerGitHub <noreply@github.com>2016-08-19 12:16:24 +0200
commit039bd0ebcacab703c4030b1137a0dbb7a9ff7199 (patch)
tree64cfdd38c76590c95980f39fdf8b26148bd6ee14
parent91e8b33ca214397dde164114f0c0f8d46dacad01 (diff)
parentf960aec5bbd82ec9848de959299bff21ef26096d (diff)
downloadnextcloud-server-039bd0ebcacab703c4030b1137a0dbb7a9ff7199.tar.gz
nextcloud-server-039bd0ebcacab703c4030b1137a0dbb7a9ff7199.zip
Merge pull request #960 from nextcloud/fix-caldavtester-master
Move over to new CalDAVTester repo (#25859)
-rw-r--r--apps/dav/tests/travis/caldav/install.sh12
-rw-r--r--apps/dav/tests/travis/carddav/install.sh12
2 files changed, 12 insertions, 12 deletions
diff --git a/apps/dav/tests/travis/caldav/install.sh b/apps/dav/tests/travis/caldav/install.sh
index 9688ec660de..e0ac30c9e46 100644
--- a/apps/dav/tests/travis/caldav/install.sh
+++ b/apps/dav/tests/travis/caldav/install.sh
@@ -3,12 +3,12 @@ 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"
+cd "$SCRIPTPATH"
+if [ ! -f CalDAVTester/testcaldav.py ]; then
+ git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
+fi
+if [ ! -f pycalendar/setup.py ]; then
+ git clone https://github.com/apple/ccs-pycalendar.git pycalendar
fi
# create test user
diff --git a/apps/dav/tests/travis/carddav/install.sh b/apps/dav/tests/travis/carddav/install.sh
index fa5d141ce0d..db8b53bc861 100644
--- a/apps/dav/tests/travis/carddav/install.sh
+++ b/apps/dav/tests/travis/carddav/install.sh
@@ -3,12 +3,12 @@ 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"
+cd "$SCRIPTPATH"
+if [ ! -f CalDAVTester/testcaldav.py ]; then
+ git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
+fi
+if [ ! -f pycalendar/setup.py ]; then
+ git clone https://github.com/apple/ccs-pycalendar.git pycalendar
fi
# create test user