diff --git a/.gitignore b/.gitignore index 3766fc5..2d0c9f4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ cover/ coverage.xml doc/source/api/ .coverage* +etc/config.ini diff --git a/etc/config.ini b/etc/config.ini-sample similarity index 92% rename from etc/config.ini rename to etc/config.ini-sample index f681ba3..995af57 100644 --- a/etc/config.ini +++ b/etc/config.ini-sample @@ -19,5 +19,5 @@ index_containers_path = /tmp/swift_filler_containers_index.pkl [concurrency] filler_keystone_client_concurrency = 5 filler_swift_client_concurrency = 10 -# This is usually bound to the max open files. +# This is usually bound to the max open files. sync_swift_client_concurrency = 10 diff --git a/swsync/utils.py b/swsync/utils.py index db50211..ca07eb4 100644 --- a/swsync/utils.py +++ b/swsync/utils.py @@ -22,6 +22,8 @@ import os CONFIG = None curdir = os.path.abspath(os.path.dirname(__file__)) INIFILE = os.path.abspath(os.path.join(curdir, '..', 'etc', "config.ini")) +SAMPLE_INIFILE = os.path.abspath(os.path.join(curdir, '..', + 'etc', "config.ini-sample")) class ConfigurationError(Exception): diff --git a/tests/units/base.py b/tests/units/base.py index b349f13..9853e06 100644 --- a/tests/units/base.py +++ b/tests/units/base.py @@ -22,6 +22,7 @@ import unittest2 import mox import stubout +from swsync import utils class TestCase(unittest2.TestCase): @@ -30,6 +31,7 @@ class TestCase(unittest2.TestCase): super(TestCase, self).setUp() self.mox = mox.Mox() self.stubs = stubout.StubOutForTesting() + utils.CONFIG = utils.parse_ini(utils.SAMPLE_INIFILE) def tearDown(self): self.mox.UnsetStubs()