mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Simplify setup code for dav tests
This commit is contained in:
parent
d30a3063c2
commit
b8faf6ffdb
1 changed files with 6 additions and 12 deletions
|
|
@ -20,20 +20,14 @@ import requests.exceptions
|
||||||
|
|
||||||
|
|
||||||
dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale'
|
dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale'
|
||||||
if dav_server == 'radicale':
|
|
||||||
from tests.storage.dav.servers.radicale import ServerMixin
|
|
||||||
elif dav_server == 'owncloud':
|
|
||||||
from tests.storage.dav.servers.owncloud import ServerMixin
|
|
||||||
else:
|
|
||||||
raise RuntimeError('{} is not a known DAV server.'.format(dav_server))
|
|
||||||
|
|
||||||
try:
|
def _get_server_mixin(server_name):
|
||||||
import radicale
|
from . import __name__ as base
|
||||||
radicale_version = radicale.VERSION
|
x = __import__('{}.servers.{}'.format(base, server_name), fromlist=[''])
|
||||||
del radicale
|
print(dir(x))
|
||||||
except ImportError:
|
return x.ServerMixin
|
||||||
radicale_version = None
|
|
||||||
|
|
||||||
|
ServerMixin = _get_server_mixin(dav_server)
|
||||||
|
|
||||||
VCARD_TEMPLATE = u'''BEGIN:VCARD
|
VCARD_TEMPLATE = u'''BEGIN:VCARD
|
||||||
VERSION:3.0
|
VERSION:3.0
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue