[tests] Change configuration to a config file

.travis.yml

@@ -10,6 +10,7 @@ before_install:
   - | # MySQLdb is not available in Python 3.x
     if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then
         pip install MYSQL-python
+        pip install configparser
     else
         pip install PyMySQL>=0.7.0
     fi
@@ -24,6 +25,7 @@ install:
 
 before_script:
   - mysql -e 'create database testhat;'
+  - cp tests/tests.conf.sample tests/tests.conf
 
 script:
   - cd tests

tests/base.py

@@ -22,6 +22,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import configparser
 import sys
 import unittest
 
@@ -30,11 +31,7 @@
 
 from sortinghat.db.database import Database
 
-from tests.config import (DB_USER,
-                          DB_PASSWORD,
-                          DB_NAME,
-                          DB_HOST,
-                          DB_PORT)
+CONFIG_FILE = 'tests.conf'
 
 
 class TestDatabaseCaseBase(unittest.TestCase):
@@ -51,7 +48,14 @@ class TestDatabaseCaseBase(unittest.TestCase):
     """
     @classmethod
     def setUpClass(cls):
-        cls.db = Database(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST, DB_PORT)
+        config = configparser.ConfigParser()
+        config.read(CONFIG_FILE)
+        cls.db_kwargs = {'user': config['Database']['user'],
+                  'password': config['Database']['password'],
+                  'database': config['Database']['name'],
+                  'host': config['Database']['host'],
+                  'port': config['Database']['port']}
+        cls.db = Database(**cls.db_kwargs)
         cls.db.clear()
 
     def setUp(self):
@@ -81,12 +85,7 @@ class TestCommandCaseBase(TestDatabaseCaseBase):
     def setUpClass(cls):
         super(TestCommandCaseBase, cls).setUpClass()
 
-        kwargs = {'user' : DB_USER,
-                  'password' : DB_PASSWORD,
-                  'database' :DB_NAME,
-                  'host' : DB_HOST,
-                  'port' : DB_PORT}
-        cls.cmd = cls.cmd_klass(**kwargs)
+        cls.cmd = cls.cmd_klass(**cls.db_kwargs)
 
     def setUp(self):
         if not hasattr(sys.stdout, 'getvalue') and not hasattr(sys.stderr, 'getvalue'):

tests/test_cmd_init.py

@@ -23,6 +23,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import configparser
 import sys
 import unittest
 import uuid
@@ -37,12 +38,12 @@
 from sortinghat.db.database import Database
 from sortinghat.exceptions import CODE_DATABASE_ERROR, CODE_VALUE_ERROR
 
-from tests.config import DB_USER, DB_PASSWORD, DB_HOST, DB_PORT
-
 
 DB_ACCESS_ERROR = r".+Access denied for user '%(user)s'@'localhost' \(using password: YES\)"
 DB_EXISTS_ERROR = r".+Can't create database '%(database)s'; database exists \(err: 1007\)"
 
+CONFIG_FILE = 'tests.conf'
+
 
 class TestInitCaseBase(unittest.TestCase):
     """Defines common setup and teardown methods on init unit tests"""
@@ -54,12 +55,15 @@ def setUp(self):
         # Create a temporal name for the registry
         self.name = 'tmp' + uuid.uuid4().hex
 
+        config = configparser.ConfigParser()
+        config.read(CONFIG_FILE)
+
         # Create command
-        self.kwargs = {'user' : DB_USER,
-                       'password' : DB_PASSWORD,
+        self.kwargs = {'user' : config['Database']['user'],
+                       'password' : config['Database']['password'],
                        'database' : self.name,
-                       'host' : DB_HOST,
-                       'port' : DB_PORT}
+                       'host' : config['Database']['host'],
+                       'port' : config['Database']['port']}
         self.cmd = Init(**self.kwargs)
 
     def tearDown(self):

tests/test_model.py

@@ -23,6 +23,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
+import configparser
 import datetime
 import sys
 import unittest
@@ -38,13 +39,13 @@
 from sortinghat.db.model import ModelBase, Organization, Domain, Country,\
     UniqueIdentity, Identity, Profile, Enrollment, MatchingBlacklist
 
-from tests.config import DB_USER, DB_PASSWORD, DB_NAME, DB_HOST, DB_PORT
-
 
 DUP_CHECK_ERROR = 'Duplicate entry'
 NULL_CHECK_ERROR = 'cannot be null'
 INVALID_DATATYPE_ERROR = 'ValueError'
 
+CONFIG_FILE = 'tests.conf'
+
 
 class MockDatabase(object):
 
@@ -73,7 +74,13 @@ class TestCaseBase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.db = MockDatabase(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST, DB_PORT)
+        config = configparser.ConfigParser()
+        config.read(CONFIG_FILE)
+        cls.db = MockDatabase(config['Database']['user'],
+                              config['Database']['password'],
+                              config['Database']['name'],
+                              config['Database']['host'],
+                              config['Database']['port'])
 
     def setUp(self):
         self.session = self.db.session()

tests/tests.conf.sample

@@ -0,0 +1,8 @@
+[Database]
+name=testhat
+
+host=127.0.0.1
+port=3306
+
+user=
+password=