diff --git a/radicale/config.py b/radicale/config.py index 47f6544..44d057e 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -99,5 +99,4 @@ if "RADICALE_CONFIG" in os.environ: _CONFIG_PARSER.read(os.environ["RADICALE_CONFIG"]) # Wrap config module into ConfigParser instance -_CONFIG_PARSER.INITIAL_CONFIG = INITIAL_CONFIG sys.modules[__name__] = _CONFIG_PARSER diff --git a/tests/__init__.py b/tests/__init__.py index 14ef5f6..b5bd194 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -34,9 +34,8 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) import radicale -RADICALE_CONFIG = os.path.join(os.path.dirname(os.path.dirname(__file__)), - "config") -os.environ["RADICALE_CONFIG"] = RADICALE_CONFIG +os.environ["RADICALE_CONFIG"] = os.path.join(os.path.dirname( + os.path.dirname(__file__)), "config") from radicale import config from radicale.auth import htpasswd @@ -50,12 +49,6 @@ class BaseTest(object): """Base class for tests.""" def request(self, method, path, data=None, **args): """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._headers = None self.application._answer = None @@ -80,10 +73,6 @@ class BaseTest(object): self.application._status = status self.application._headers = headers - @property - def config_instance(self): - return self._CONFIG_PARSER - class FileSystem(BaseTest): """Base class for filesystem tests."""