tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import storage modules after configuration in tests

Browse Source
This commit is contained in:
Guillaume Ayoub 2013-09-25 13:44:08 +02:00
parent 07f7e46b3e
commit 6c9976f46a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/__init__.py
View File

@ -39,7 +39,6 @@ os.environ["RADICALE_CONFIG"] = os.path.join(os.path.dirname(
from radicale import config from radicale import config
from radicale.auth import htpasswd from radicale.auth import htpasswd
from radicale.storage import filesystem, database
from .helpers import get_file_content from .helpers import get_file_content
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from sqlalchemy import create_engine from sqlalchemy import create_engine
@ -84,6 +83,7 @@ class FileSystem(BaseTest):
"""Setup function for each test.""" """Setup function for each test."""
self.colpath = tempfile.mkdtemp() self.colpath = tempfile.mkdtemp()
config.set("storage", "type", self.storage_type) config.set("storage", "type", self.storage_type)
from radicale.storage import filesystem
filesystem.FOLDER = self.colpath filesystem.FOLDER = self.colpath
filesystem.GIT_REPOSITORY = None filesystem.GIT_REPOSITORY = None
self.application = radicale.Application() self.application = radicale.Application()
@ -103,6 +103,7 @@ class DataBaseSystem(BaseTest):
def setup(self): def setup(self):
config.set("storage", "type", "database") config.set("storage", "type", "database")
config.set("storage", "database_url", "sqlite://") config.set("storage", "database_url", "sqlite://")
from radicale.storage import database
database.Session = sessionmaker() database.Session = sessionmaker()
database.Session.configure(bind=create_engine("sqlite://")) database.Session.configure(bind=create_engine("sqlite://"))
session = database.Session() session = database.Session()
@ -118,6 +119,7 @@ class GitFileSystem(FileSystem):
def setup(self): def setup(self):
super(GitFileSystem, self).setup() super(GitFileSystem, self).setup()
Repo.init(self.colpath) Repo.init(self.colpath)
from radicale.storage import filesystem
filesystem.GIT_REPOSITORY = Repo(self.colpath) filesystem.GIT_REPOSITORY = Repo(self.colpath)