Remove django test environment setup code.

[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..d7c2336b0866848ea49bc090e1cfbafbdbbc1fd4 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
 
@@ -110,8 +114,11 @@ class InventoryTestCase(TestCase):
         return flowcells
 
 def suite():
-    return unittest.makeSuite(InventoryTestCase, 'test')
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(InventoryTestCase))
+    return suite
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="suite")
-
+    from unittest2 import main
+    main(defaultTest="suite")