From c6e66dc6823d02d8e8207c16b95a8bf58ecca8a3 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 16 Jun 2016 15:28:24 +0200
Subject: [PATCH] Test nextcloud (#473)

---
 .gitmodules                     |  3 +++
 .travis.yml                     | 24 ++++++++++++++++++++++++
 scripts/make_travisconf.py      |  5 +++--
 tests/storage/servers/nextcloud |  1 +
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 160000 tests/storage/servers/nextcloud

diff --git a/.gitmodules b/.gitmodules
index 97e75a6..76bdf3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "tests/storage/servers/davical"]
 	path = tests/storage/servers/davical
 	url = https://github.com/vdirsyncer/davical-testserver
+[submodule "tests/storage/servers/nextcloud"]
+	path = tests/storage/servers/nextcloud
+	url = git@github.com:vdirsyncer/nextcloud-testserver
diff --git a/.travis.yml b/.travis.yml
index 84034f6..dc035c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,18 @@
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
         "python": "2.7"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
+        "python": "2.7"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
+        "python": "2.7"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
+        "python": "2.7"
+      },
       {
         "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
         "python": "2.7"
@@ -138,6 +150,18 @@
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
         "python": "3.5"
       },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
+        "python": "3.5"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
+        "python": "3.5"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
+        "python": "3.5"
+      },
       {
         "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
         "python": "3.5"
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 1be8e07..e088896 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -45,10 +45,11 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
     })
 
     if python == "3.5":
-        dav_servers = ("radicale", "owncloud", "baikal", "davical")
+        dav_servers = ("radicale", "owncloud", "nextcloud", "baikal",
+                       "davical")
         rs_servers = ("mysteryshack",)
     elif python == "2.7":
-        dav_servers = ("owncloud", "baikal", "davical")
+        dav_servers = ("owncloud", "nextcloud", "baikal", "davical")
         rs_servers = ("mysteryshack",)
     elif python == "pypy":
         dav_servers = ()
diff --git a/tests/storage/servers/nextcloud b/tests/storage/servers/nextcloud
new file mode 160000
index 0000000..b8fb35f
--- /dev/null
+++ b/tests/storage/servers/nextcloud
@@ -0,0 +1 @@
+Subproject commit b8fb35f556eab60502484dee43a14566806642af