From e9d0ec898b3d73a258cea96ff9cca4aca94e97df Mon Sep 17 00:00:00 2001
From: Matt Prahl <mprahl@redhat.com>
Date: Thu, 8 Dec 2016 14:58:38 -0500
Subject: [PATCH] Use test database instead of in-memory database for all tests
 for consistency

---
 .gitignore                     |  1 +
 Vagrantfile                    |  1 +
 conf/config.py                 |  3 ++-
 tests/test_build/test_build.py | 18 ------------------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 875b8ea6..3d5d1a8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ server.key
 /dist/
 /module_build_service.egg-info/
 build/
+test_module_build_service.db
diff --git a/Vagrantfile b/Vagrantfile
index 5d75f9b5..0895171d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -32,6 +32,7 @@ $script = <<SCRIPT
     mkdir /etc/module-build-service/
     cd /tmp/module_build_service
     python setup.py develop
+    pip install -r /tmp/module_build_service/test-requirements.txt
     mbs-upgradedb
     mbs-gencert
 SCRIPT
diff --git a/conf/config.py b/conf/config.py
index bddd1dc4..d6caa35f 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -130,7 +130,8 @@ class DevConfiguration(BaseConfiguration):
 class TestConfiguration(BaseConfiguration):
     LOG_BACKEND = 'console'
     LOG_LEVEL = 'debug'
-    SQLALCHEMY_DATABASE_URI = 'sqlite:///:memory:'
+    SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(
+        path.join(dbdir, 'tests', 'test_module_build_service.db'))
     DEBUG = True
     MESSAGING = 'in_memory'
 
diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py
index 471c090e..5af0c84e 100644
--- a/tests/test_build/test_build.py
+++ b/tests/test_build/test_build.py
@@ -165,13 +165,6 @@ class TestModuleBuilder(GenericBuilder):
         if TestModuleBuilder.on_cancel_cb:
             TestModuleBuilder.on_cancel_cb(self, task_id)
 
-def set_dburi(dburi):
-    """
-    Sets database URI in all places in the middle of test.
-    """
-    conf.set_item("sqlalchemy_database_uri", dburi)
-    test_conf.set_item("sqlalchemy_database_uri", dburi)
-    app.config["SQLALCHEMY_DATABASE_URI"] = dburi
 
 class TestBuild(unittest.TestCase):
 
@@ -180,22 +173,11 @@ class TestBuild(unittest.TestCase):
         self.client = app.test_client()
         conf.set_item("system", "mock")
 
-        # We need to use real database on fileystem for these tests, because
-        # there might be multiple threads and processes accessing it
-        # and in-memory database wouldn't work.
-        self.orig_dburi = app.config["SQLALCHEMY_DATABASE_URI"]
-        dbdir = path.abspath(path.dirname(__file__))
-        dburi =  'sqlite:///{0}'.format(path.join(
-            dbdir, '.test_module_build_service.db'))
-        set_dburi(dburi)
-
         init_data()
         models.ModuleBuild.query.delete()
         models.ComponentBuild.query.delete()
 
     def tearDown(self):
-        # Set back the original database URI
-        set_dburi(self.orig_dburi)
         conf.set_item("system", "koji")
         TestModuleBuilder.reset()