sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto merge of #378 - untitaker:server-submodules, r=untitaker

Browse source 
Add servers as submodules

Fix #377
This commit is contained in:
Homu 2016-03-11 20:14:21 +09:00
commit f9375eaa82
8 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,7 +1,3 @@
tests/storage/servers/*
!tests/storage/servers/__init__.py
!tests/storage/servers/radicale
!tests/storage/servers/skip
*.pyc *.pyc
__pycache__ __pycache__
htmlcov htmlcov

12
.gitmodules vendored Normal file
View file

@ -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

13
Makefile
View file

@ -12,10 +12,7 @@ install-servers:
set -ex; \ set -ex; \
for server in $(DAV_SERVER) $(REMOTESTORAGE_SERVER); do \ for server in $(DAV_SERVER) $(REMOTESTORAGE_SERVER); do \
if [ ! -d "$(TESTSERVER_BASE)$$server/" ]; then \ if [ ! -d "$(TESTSERVER_BASE)$$server/" ]; then \
git clone --depth=1 \ git submodule update --init -- "$(TESTSERVER_BASE)$$server"; \
https://github.com/vdirsyncer/$$server-testserver.git \
/tmp/$$server-testserver; \
ln -s /tmp/$$server-testserver $(TESTSERVER_BASE)$$server; \
fi; \ fi; \
(cd $(TESTSERVER_BASE)$$server && sh install.sh); \ (cd $(TESTSERVER_BASE)$$server && sh install.sh); \
done done
@ -85,4 +82,12 @@ install-dev:
pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \ pip install -U --force-reinstall $$(python setup.py --quiet minimal_requirements); \
fi 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 .PHONY: docs

1
setup.cfg
View file

@ -7,3 +7,4 @@ norecursedirs = tests/storage/servers/*
[flake8] [flake8]
# W503: Line break before operator # W503: Line break before operator
ignore = W503, E731 ignore = W503, E731
exclude = tests/storage/servers/*

1
tests/storage/servers/baikal Submodule

@ -0,0 +1 @@
Subproject commit b3f2f5df327dec0add73a262e015954fb56287f6

1
tests/storage/servers/davical Submodule

@ -0,0 +1 @@
Subproject commit cce1273cc883f3cdb3ccf37097b29ac0263b7055

1
tests/storage/servers/mysteryshack Submodule

@ -0,0 +1 @@
Subproject commit addee3272a4289b78e3c816e0fcb4ccace0df336

1
tests/storage/servers/owncloud Submodule

@ -0,0 +1 @@
Subproject commit 9f4b305b7e77fa42f8c1875099236ecb792b40dc