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

Use py.test's tmpdir fixture

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-03-28 21:40:14 +01:00
parent 8f1531a4b2
commit eae0cff48f
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tests/storage/dav/_radicale.py
View file

@ -15,9 +15,8 @@
import sys import sys
import os import os
import urlparse import urlparse
import tempfile
import shutil import shutil
import mock import pytest
from werkzeug.test import Client from werkzeug.test import Client
from werkzeug.wrappers import BaseResponse as WerkzeugResponse from werkzeug.wrappers import BaseResponse as WerkzeugResponse
@ -90,11 +89,6 @@ def do_the_radicale_dance(tmpdir):
else: else:
raise RuntimeError() raise RuntimeError()
# This one is particularly useful with radicale's debugging logs and
# pytest-capturelog, however, it is very verbose.
#import radicale.log
#radicale.log.start()
class Response(object): class Response(object):
@ -116,33 +110,28 @@ class Response(object):
raise HTTPError(str(self.status_code)) raise HTTPError(str(self.status_code))
def wsgi_setup(app):
c = Client(app, WerkzeugResponse)
def x(session, method, url, data=None, headers=None, **kw):
path = urlparse.urlparse(url).path
assert isinstance(data, bytes) or data is None
r = c.open(path=path, method=method, data=data, headers=headers)
r = Response(r)
return r
p = mock.patch('requests.Session.request', new=x)
p.start()
return p.stop
class ServerMixin(object): class ServerMixin(object):
'''hrefs are paths without scheme or netloc''' '''hrefs are paths without scheme or netloc'''
storage_class = None storage_class = None
wsgi_teardown = None wsgi_teardown = None
tmpdir = None tmpdir = None
def setup_method(self, method): @pytest.fixture(autouse=True)
self.tmpdir = tempfile.mkdtemp() def setup(self, monkeypatch, tmpdir):
do_the_radicale_dance(self.tmpdir) do_the_radicale_dance(str(tmpdir))
from radicale import Application from radicale import Application
app = Application() app = Application()
self.wsgi_teardown = wsgi_setup(app) c = Client(app, WerkzeugResponse)
def request(self, method, url, data=None, headers=None, **kw):
path = urlparse.urlparse(url).path
assert isinstance(data, bytes) or data is None
r = c.open(path=path, method=method, data=data,
headers=headers)
r = Response(r)
return r
monkeypatch.setattr('requests.sessions.Session.request', request)
def get_storage_args(self, collection='test'): def get_storage_args(self, collection='test'):
url = 'http://127.0.0.1/bob/' url = 'http://127.0.0.1/bob/'