Merge pull request #57 from morucci/issue-30

Rename config.ini add it to .gitignore
This commit is contained in:
Chmouel Boudjnah 2013-04-22 02:49:18 -07:00
commit 2235b00628
4 changed files with 6 additions and 1 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ cover/
coverage.xml coverage.xml
doc/source/api/ doc/source/api/
.coverage* .coverage*
etc/config.ini

View File

@ -22,6 +22,8 @@ import os
CONFIG = None CONFIG = None
curdir = os.path.abspath(os.path.dirname(__file__)) curdir = os.path.abspath(os.path.dirname(__file__))
INIFILE = os.path.abspath(os.path.join(curdir, '..', 'etc', "config.ini")) 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): class ConfigurationError(Exception):

View File

@ -22,6 +22,7 @@ import unittest2
import mox import mox
import stubout import stubout
from swsync import utils
class TestCase(unittest2.TestCase): class TestCase(unittest2.TestCase):
@ -30,6 +31,7 @@ class TestCase(unittest2.TestCase):
super(TestCase, self).setUp() super(TestCase, self).setUp()
self.mox = mox.Mox() self.mox = mox.Mox()
self.stubs = stubout.StubOutForTesting() self.stubs = stubout.StubOutForTesting()
utils.CONFIG = utils.parse_ini(utils.SAMPLE_INIFILE)
def tearDown(self): def tearDown(self):
self.mox.UnsetStubs() self.mox.UnsetStubs()