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

Merge pull request #894 from pimutils/optimise-test-servers

Browse source 
Move test server dockerfiles out-of-repo
This commit is contained in:
Hugo Osvaldo Barrera 2021-06-12 11:36:15 +02:00 committed by GitHub
commit 2336076baf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,6 +0,0 @@
[submodule "tests/storage/servers/owncloud"]
path = tests/storage/servers/owncloud
url = https://github.com/vdirsyncer/owncloud-testserver
[submodule "tests/storage/servers/nextcloud"]
path = tests/storage/servers/nextcloud
url = https://github.com/vdirsyncer/nextcloud-testserver

3
Makefile
View file

@ -63,9 +63,6 @@ all:
install-servers: install-servers:
set -ex; \ set -ex; \
for server in $(DAV_SERVER); do \ for server in $(DAV_SERVER); do \
if [ ! "$$(ls $(TESTSERVER_BASE)$$server/)" ]; then \
git submodule update --init -- "$(TESTSERVER_BASE)$$server"; \
fi; \
(cd $(TESTSERVER_BASE)$$server && sh install.sh); \ (cd $(TESTSERVER_BASE)$$server && sh install.sh); \
done done

5
docker/radicale/Dockerfile
View file

@ -1,5 +0,0 @@
FROM python:3.8
RUN pip install radicale
CMD radicale --storage-filesystem-folder /tmp/dav -H 0.0.0.0:8001 -D

13
docker/xandikos/Dockerfile
View file

@ -1,13 +0,0 @@
# Original file copyright 2017 Jelmer Vernooij
FROM ubuntu:bionic
RUN apt-get update && apt-get -y install xandikos locales
EXPOSE 8000
RUN locale-gen en_US.UTF-8
ENV PYTHONIOENCODING=utf-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
CMD xandikos -d /tmp/dav -l 0.0.0.0 -p 8000 --autocreate

1
tests/storage/servers/nextcloud

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

1
tests/storage/servers/owncloud

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

5
tests/storage/servers/radicale/install.sh
View file

@ -1,6 +1,3 @@
#!/bin/sh #!/bin/sh
cd $(git rev-parse --show-toplevel) docker run -d -p 8001:8001 whynothugo/vdirsyncer-devkit-radicale
docker build -t radicale docker/radicale
docker run -d -p 8001:8001 radicale

5
tests/storage/servers/xandikos/install.sh
View file

@ -1,6 +1,3 @@
#!/bin/sh #!/bin/sh
cd $(git rev-parse --show-toplevel) docker run -d -p 8000:8000 whynothugo/vdirsyncer-devkit-xandikos
docker build -t xandikos docker/xandikos
docker run -d -p 8000:8000 xandikos

36
tests/storage/test_filesystem.py
View file

@ -46,38 +46,40 @@ class TestFilesystemStorage(StorageTests):
def test_ignore_tmp_files(self, tmpdir): def test_ignore_tmp_files(self, tmpdir):
"""Test that files with .tmp suffix beside .ics files are ignored.""" """Test that files with .tmp suffix beside .ics files are ignored."""
s = self.storage_class(str(tmpdir), '.ics') s = self.storage_class(str(tmpdir), ".ics")
s.upload(Item('UID:xyzxyz')) s.upload(Item("UID:xyzxyz"))
item_file, = tmpdir.listdir() (item_file,) = tmpdir.listdir()
item_file.copy(item_file.new(ext='tmp')) item_file.copy(item_file.new(ext="tmp"))
assert len(tmpdir.listdir()) == 2 assert len(tmpdir.listdir()) == 2
assert len(list(s.list())) == 1 assert len(list(s.list())) == 1
def test_ignore_tmp_files_empty_fileext(self, tmpdir): def test_ignore_tmp_files_empty_fileext(self, tmpdir):
"""Test that files with .tmp suffix are ignored with empty fileext.""" """Test that files with .tmp suffix are ignored with empty fileext."""
s = self.storage_class(str(tmpdir), '') s = self.storage_class(str(tmpdir), "")
s.upload(Item('UID:xyzxyz')) s.upload(Item("UID:xyzxyz"))
item_file, = tmpdir.listdir() (item_file,) = tmpdir.listdir()
item_file.copy(item_file.new(ext='tmp')) item_file.copy(item_file.new(ext="tmp"))
assert len(tmpdir.listdir()) == 2 assert len(tmpdir.listdir()) == 2
# assert False, tmpdir.listdir() # enable to see the created filename # assert False, tmpdir.listdir() # enable to see the created filename
assert len(list(s.list())) == 1 assert len(list(s.list())) == 1
def test_ignore_files_typical_backup(self, tmpdir): def test_ignore_files_typical_backup(self, tmpdir):
"""Test file-name ignorance with typical backup ending ~.""" """Test file-name ignorance with typical backup ending ~."""
ignorext = "~" # without dot ignorext = "~" # without dot
s = self.storage_class(str(tmpdir), '', fileignoreext="~")
s.upload(Item('UID:xyzxyz')) storage = self.storage_class(str(tmpdir), "", fileignoreext=ignorext)
item_file, = tmpdir.listdir() storage.upload(Item("UID:xyzxyz"))
item_file.copy(item_file.new(basename=item_file.basename+'~')) (item_file,) = tmpdir.listdir()
item_file.copy(item_file.new(basename=item_file.basename + ignorext))
assert len(tmpdir.listdir()) == 2 assert len(tmpdir.listdir()) == 2
#assert False, tmpdir.listdir() # enable to see the created filename assert len(list(storage.list())) == 1
assert len(list(s.list())) == 1
def test_too_long_uid(self, tmpdir): def test_too_long_uid(self, tmpdir):
s = self.storage_class(str(tmpdir), ".txt") storage = self.storage_class(str(tmpdir), ".txt")
item = Item("UID:" + "hue" * 600) item = Item("UID:" + "hue" * 600)
href, etag = s.upload(item)
href, etag = storage.upload(item)
assert item.uid not in href assert item.uid not in href
def test_post_hook_inactive(self, tmpdir, monkeypatch): def test_post_hook_inactive(self, tmpdir, monkeypatch):