Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / frontend / inventory / test_inventory.py

diff --git a/htsworkflow/frontend/inventory/test_inventory.py b/htsworkflow/frontend/inventory/test_inventory.py
index 86d37b7cbe7e740468f04df9380ae8fa82c98b35..e3937e175bb0338e2c78b6a0092454eef2c0c232 100644 (file)
--- a/htsworkflow/frontend/inventory/test_inventory.py
+++ b/htsworkflow/frontend/inventory/test_inventory.py
@@ -16,7 +16,7 @@ def localhostNode(url):
     return RDF.Node(RDF.Uri('http://localhost%s' % (url,)))
 
 class InventoryTestCase(TestCase):
-    fixtures = ['test_user', 'test_harddisks']
+    fixtures = ['initial_data', 'test_user', 'test_harddisks']
 
     def test_fixture(self):
         # make sure that some of our test data is was loaded
@@ -113,21 +113,12 @@ class InventoryTestCase(TestCase):
         flowcells = [ str(x.uri) for x in targets]
         return flowcells
 
-OLD_DB = settings.DATABASES['default']['NAME']
-def setUpModule():
-    setup_test_environment()
-    connection.creation.create_test_db()
-
-def tearDownModule():
-    connection.creation.destroy_test_db(OLD_DB)
-    teardown_test_environment()
-
 def suite():
-    from unittest2 import TestSuite, defaultTestLoader
+    from unittest import TestSuite, defaultTestLoader
     suite = TestSuite()
     suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
     return suite
 
 if __name__ == "__main__":
-    from unittest2 import main
+    from unittest import main
     main(defaultTest="suite")