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

Skip radicale tests for broken database storage.

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-03-21 17:38:01 +01:00
parent 61cc5bbf75
commit ab77840b5e
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
install-deps.sh
View file

@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
echo "The shell is $SHELL" echo "The shell is $SHELL"
set -e set -e
pip install --use-mirrors --editable . PIP_INSTALL="pip install --use-mirrors --upgrade"
pip install --use-mirrors -r requirements.txt $PIP_INSTALL --editable .
$PIP_INSTALL -r requirements.txt
[ -n "$DAV_SERVER" ] || DAV_SERVER=radicale_filesystem [ -n "$DAV_SERVER" ] || DAV_SERVER=radicale_filesystem
davserver_radicale_filesystem() { davserver_radicale_filesystem() {
@ -11,7 +12,7 @@ davserver_radicale_filesystem() {
davserver_radicale_database() { davserver_radicale_database() {
radicale_deps radicale_deps
pip install --use-mirrors sqlalchemy pysqlite $PIP_INSTALL sqlalchemy pysqlite
} }
radicale_deps() { radicale_deps() {
@ -22,7 +23,7 @@ radicale_deps() {
else else
false false
fi fi
pip install --use-mirrors werkzeug $radicale_pkg $PIP_INSTALL werkzeug $radicale_pkg
} }
davserver_owncloud() { davserver_owncloud() {

13
tests/storage/dav/__init__.py
View file

@ -9,6 +9,7 @@
''' '''
import os import os
import pytest
from .. import StorageTests from .. import StorageTests
import vdirsyncer.exceptions as exceptions import vdirsyncer.exceptions as exceptions
@ -24,6 +25,18 @@ elif dav_server == 'owncloud':
else: else:
raise RuntimeError('{} is not a known DAV server.'.format(dav_server)) raise RuntimeError('{} is not a known DAV server.'.format(dav_server))
try:
import radicale
radicale_version = radicale.VERSION
del radicale
except ImportError:
radicale_version = None
pytestmark = pytest.mark.xfail(
dav_server == 'radicale_database' and radicale_version == '0.8',
reason='Database storage of Radicale 0.8 is broken.')
class DavStorageTests(ServerMixin, StorageTests): class DavStorageTests(ServerMixin, StorageTests):
def test_dav_broken_item(self): def test_dav_broken_item(self):

4
tests/storage/dav/conftest.py
View file

@ -11,7 +11,9 @@ import os
import pytest import pytest
dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale_filesystem' dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale_filesystem'
php_sh = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../../owncloud-testserver/php.sh')) php_sh = os.path.abspath(os.path.join(
os.path.dirname(__file__), '../../../owncloud-testserver/php.sh'
))
if dav_server == 'owncloud': if dav_server == 'owncloud':
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)

2
tests/storage/dav/test_caldav.py
View file

@ -12,7 +12,7 @@
import requests.exceptions import requests.exceptions
from vdirsyncer.storage.dav.caldav import CaldavStorage from vdirsyncer.storage.dav.caldav import CaldavStorage
import vdirsyncer.exceptions as exceptions import vdirsyncer.exceptions as exceptions
from . import DavStorageTests from . import DavStorageTests, pytestmark
TASK_TEMPLATE = u'''BEGIN:VCALENDAR TASK_TEMPLATE = u'''BEGIN:VCALENDAR

2
tests/storage/dav/test_carddav.py
View file

@ -9,7 +9,7 @@
''' '''
from vdirsyncer.storage.dav.carddav import CarddavStorage from vdirsyncer.storage.dav.carddav import CarddavStorage
from . import DavStorageTests from . import DavStorageTests, pytestmark
VCARD_TEMPLATE = u'''BEGIN:VCARD VCARD_TEMPLATE = u'''BEGIN:VCARD