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

Fixes tests to use the default project root config

Browse Source
This commit is contained in:
Jean-Marc Martins 2013-09-09 15:36:30 +02:00
parent 87ec798f37
commit 33f09016fd
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
radicale/config.py
View File

@ -99,4 +99,5 @@ if "RADICALE_CONFIG" in os.environ:
_CONFIG_PARSER.read(os.environ["RADICALE_CONFIG"]) _CONFIG_PARSER.read(os.environ["RADICALE_CONFIG"])
# Wrap config module into ConfigParser instance # Wrap config module into ConfigParser instance
_CONFIG_PARSER.INITIAL_CONFIG = INITIAL_CONFIG
sys.modules[__name__] = _CONFIG_PARSER sys.modules[__name__] = _CONFIG_PARSER

15
tests/__init__.py
View File

@ -33,6 +33,11 @@ from io import BytesIO
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
import radicale import radicale
RADICALE_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)),
"config")
os.environ["RADICALE_CONFIG"] = RADICALE_CONFIG
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 radicale.storage import filesystem, database
@ -45,6 +50,12 @@ class BaseTest(object):
"""Base class for tests.""" """Base class for tests."""
def request(self, method, path, data=None, **args): def request(self, method, path, data=None, **args):
"""Send a request.""" """Send a request."""
# Create a ConfigParser and configure it
# This uses the default config file at the root of the
# Radicale Project
config.read(os.environ.get("RADICALE_CONFIG"))
self._CONFIG_PARSER = config
self.application._status = None self.application._status = None
self.application._headers = None self.application._headers = None
self.application._answer = None self.application._answer = None
@ -69,6 +80,10 @@ class BaseTest(object):
self.application._status = status self.application._status = status
self.application._headers = headers self.application._headers = headers
@property
def config_instance(self):
return self._CONFIG_PARSER
class FileSystem(BaseTest): class FileSystem(BaseTest):
"""Base class for filesystem tests.""" """Base class for filesystem tests."""