From 6a2dc53db92af9e055750bb320e0f369866182e8 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 10 Mar 2016 22:46:26 +0100
Subject: [PATCH 1/3] Add servers as submodules

---
 .gitignore                         |  4 ----
 .gitmodules                        | 12 ++++++++++++
 Makefile                           |  5 +----
 tests/storage/servers/baikal       |  1 +
 tests/storage/servers/davical      |  1 +
 tests/storage/servers/mysteryshack |  1 +
 tests/storage/servers/owncloud     |  1 +
 7 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 tests/storage/servers/baikal
 create mode 160000 tests/storage/servers/davical
 create mode 160000 tests/storage/servers/mysteryshack
 create mode 160000 tests/storage/servers/owncloud

diff --git a/.gitignore b/.gitignore
index 1e26850..7538d58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-tests/storage/servers/*
-!tests/storage/servers/__init__.py
-!tests/storage/servers/radicale
-!tests/storage/servers/skip
 *.pyc
 __pycache__
 htmlcov
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..97e75a6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "tests/storage/servers/baikal"]
+	path = tests/storage/servers/baikal
+	url = https://github.com/vdirsyncer/baikal-testserver
+[submodule "tests/storage/servers/owncloud"]
+	path = tests/storage/servers/owncloud
+	url = https://github.com/vdirsyncer/owncloud-testserver
+[submodule "tests/storage/servers/mysteryshack"]
+	path = tests/storage/servers/mysteryshack
+	url = https://github.com/vdirsyncer/mysteryshack-testserver
+[submodule "tests/storage/servers/davical"]
+	path = tests/storage/servers/davical
+	url = https://github.com/vdirsyncer/davical-testserver
diff --git a/Makefile b/Makefile
index 52acc9f..a6f28fa 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,7 @@ install-servers:
 	set -ex; \
 	for server in $(DAV_SERVER) $(REMOTESTORAGE_SERVER); do \
 		if [ ! -d "$(TESTSERVER_BASE)$$server/" ]; then \
-			git clone --depth=1 \
-				https://github.com/vdirsyncer/$$server-testserver.git \
-				/tmp/$$server-testserver; \
-			ln -s /tmp/$$server-testserver $(TESTSERVER_BASE)$$server; \
+			git submodule update --init -- "$(TESTSERVER_BASE)$$server"; \
 		fi; \
 		(cd $(TESTSERVER_BASE)$$server && sh install.sh); \
 	done
diff --git a/tests/storage/servers/baikal b/tests/storage/servers/baikal
new file mode 160000
index 0000000..b3f2f5d
--- /dev/null
+++ b/tests/storage/servers/baikal
@@ -0,0 +1 @@
+Subproject commit b3f2f5df327dec0add73a262e015954fb56287f6
diff --git a/tests/storage/servers/davical b/tests/storage/servers/davical
new file mode 160000
index 0000000..cce1273
--- /dev/null
+++ b/tests/storage/servers/davical
@@ -0,0 +1 @@
+Subproject commit cce1273cc883f3cdb3ccf37097b29ac0263b7055
diff --git a/tests/storage/servers/mysteryshack b/tests/storage/servers/mysteryshack
new file mode 160000
index 0000000..addee32
--- /dev/null
+++ b/tests/storage/servers/mysteryshack
@@ -0,0 +1 @@
+Subproject commit addee3272a4289b78e3c816e0fcb4ccace0df336
diff --git a/tests/storage/servers/owncloud b/tests/storage/servers/owncloud
new file mode 160000
index 0000000..9f4b305
--- /dev/null
+++ b/tests/storage/servers/owncloud
@@ -0,0 +1 @@
+Subproject commit 9f4b305b7e77fa42f8c1875099236ecb792b40dc

From 89923a0e727a0b73525f226024e03ba626e3ece1 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 10 Mar 2016 23:17:07 +0100
Subject: [PATCH 2/3] Add helper target for setting submodules to SSH URLs

---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index a6f28fa..fcc2cd6 100644
--- a/Makefile
+++ b/Makefile
@@ -82,4 +82,12 @@ install-dev:
 		pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \
 	fi
 
+ssh-submodule-urls:
+	git submodule foreach "\
+		echo -n 'Old: '; \
+		git remote get-url origin; \
+		git remote set-url origin \$$(git remote get-url origin | sed -e 's/https:\/\/github\.com\//git@github.com:/g'); \
+		echo -n 'New URL: '; \
+		git remote get-url origin"
+
 .PHONY: docs

From 7f124494ee5ddeb21e40bb698dfe582e3c97e8fe Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Fri, 11 Mar 2016 12:14:10 +0100
Subject: [PATCH 3/3] Exclude servers from flake8

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 8a900e1..adcb0a7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,3 +7,4 @@ norecursedirs = tests/storage/servers/*
 [flake8]
 # W503: Line break before operator
 ignore = W503, E731
+exclude = tests/storage/servers/*