Initial port to python3

[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 024a334cb5ad4bc035e8e2a3d8f76aa72c9c50d3..a66ebce77cf0354f6571a304aa30f3d4db39db53 100644 (file)
--- a/htsworkflow/frontend/inventory/test_inventory.py
+++ b/htsworkflow/frontend/inventory/test_inventory.py
@@ -1,7 +1,11 @@
 import RDF
-import unittest
 
 from django.test import TestCase
+from django.test.utils import setup_test_environment, \
+     teardown_test_environment
+from django.db import connection
+from django.conf import settings
+
 from django.contrib.auth.models import User
 from django.core import urlresolvers
 
@@ -34,7 +38,7 @@ class InventoryTestCase(TestCase):
 
         itemNode = RDF.Node(RDF.Uri(url))
         item_type = fromTypedNode(model.get_target(itemNode, inventoryOntology['item_type']))
-        self.failUnlessEqual(item_type, u'Hard Drive')
+        self.failUnlessEqual(item_type, 'Hard Drive')
 
     def test_itemindex(self):
         url = '/inventory/it/Hard Drive/'
@@ -109,9 +113,21 @@ 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():
-    return unittest.makeSuite(InventoryTestCase, 'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
+    return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
-
+    from unittest import main
+    main(defaultTest="suite")