Restructure that mess

This commit is contained in:
Markus Unterwaditzer 2014-02-26 20:41:35 +01:00
parent 65548f72f4
commit 784c0edb5d

View file

@ -16,24 +16,23 @@ import shutil
from vdirsyncer.storage.caldav import CaldavStorage from vdirsyncer.storage.caldav import CaldavStorage
from . import StorageTests from . import StorageTests
class CaldavStorageTests(TestCase, StorageTests): from werkzeug.test import Client
tmpdir = None from werkzeug.wrappers import BaseResponse as WerkzeugResponse
def _get_storage(self, **kwargs):
self.tmpdir = tempfile.mkdtemp()
os.environ['RADICALE_CONFIG'] = ''
import radicale.config as radicale_config
radicale_config.set('storage', 'type', 'filesystem')
radicale_config.set('storage', 'filesystem_folder', self.tmpdir)
radicale_config.set('rights', 'type', 'None')
from radicale import Application # All of radicale is already global state, there's nothing we can do
app = Application() os.environ['RADICALE_CONFIG'] = ''
import radicale.log import radicale.config as radicale_config
radicale.log.start() radicale_config.set('storage', 'type', 'filesystem')
from werkzeug.test import Client radicale_config.set('storage', 'filesystem_folder', None)
from werkzeug.wrappers import BaseResponse as WerkzeugResponse radicale_config.set('rights', 'type', 'None')
class Response(object):
from radicale import Application
import radicale.log
radicale.log.start()
class Response(object):
'''Fake API of requests module''' '''Fake API of requests module'''
def __init__(self, x): def __init__(self, x):
self.x = x self.x = x
@ -47,10 +46,20 @@ class CaldavStorageTests(TestCase, StorageTests):
from requests.exceptions import HTTPError from requests.exceptions import HTTPError
raise HTTPError(str(self.status_code)) raise HTTPError(str(self.status_code))
class CaldavStorageTests(TestCase, StorageTests):
tmpdir = None
def _get_storage(self, **kwargs):
self.tmpdir = tempfile.mkdtemp()
radicale_config.set('storage', 'filesystem_folder', self.tmpdir)
app = Application()
c = Client(app, WerkzeugResponse) c = Client(app, WerkzeugResponse)
server = 'http://127.0.0.1' server = 'http://127.0.0.1'
calendar_path = '/bob/test.ics/' calendar_path = '/bob/test.ics/'
full_url = server + calendar_path full_url = server + calendar_path
def x(method, item, data=None, headers=None): def x(method, item, data=None, headers=None):
assert '/' not in item assert '/' not in item
url = calendar_path + item url = calendar_path + item