mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-25 14:37:47 +00:00
Fix envvars in radicale
This commit is contained in:
parent
4439b2ef91
commit
dace3b5daa
1 changed files with 4 additions and 2 deletions
|
|
@ -57,7 +57,7 @@ create table property (
|
||||||
primary key (name, collection_path));
|
primary key (name, collection_path));
|
||||||
'''
|
'''
|
||||||
|
|
||||||
dav_server = os.environ.get('DAV_SERVER', 'radicale_filesystem')
|
dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale_filesystem'
|
||||||
|
|
||||||
|
|
||||||
def do_the_radicale_dance(tmpdir):
|
def do_the_radicale_dance(tmpdir):
|
||||||
|
|
@ -80,7 +80,7 @@ def do_the_radicale_dance(tmpdir):
|
||||||
if dav_server == 'radicale_filesystem':
|
if dav_server == 'radicale_filesystem':
|
||||||
radicale.config.set('storage', 'type', 'filesystem')
|
radicale.config.set('storage', 'type', 'filesystem')
|
||||||
radicale.config.set('storage', 'filesystem_folder', tmpdir)
|
radicale.config.set('storage', 'filesystem_folder', tmpdir)
|
||||||
else:
|
elif dav_server == 'radicale_database':
|
||||||
radicale.config.set('storage', 'type', 'database')
|
radicale.config.set('storage', 'type', 'database')
|
||||||
radicale.config.set('storage', 'database_url', 'sqlite://')
|
radicale.config.set('storage', 'database_url', 'sqlite://')
|
||||||
from radicale.storage import database
|
from radicale.storage import database
|
||||||
|
|
@ -89,6 +89,8 @@ def do_the_radicale_dance(tmpdir):
|
||||||
for line in RADICALE_SCHEMA.split(';'):
|
for line in RADICALE_SCHEMA.split(';'):
|
||||||
s.execute(line)
|
s.execute(line)
|
||||||
s.commit()
|
s.commit()
|
||||||
|
else:
|
||||||
|
raise RuntimeError()
|
||||||
|
|
||||||
# This one is particularly useful with radicale's debugging logs and
|
# This one is particularly useful with radicale's debugging logs and
|
||||||
# pytest-capturelog, however, it is very verbose.
|
# pytest-capturelog, however, it is very verbose.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue