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 118c654aaf8463ee638d748414c5c620df9c0d67..e3937e175bb0338e2c78b6a0092454eef2c0c232 100644 (file)
--- a/htsworkflow/frontend/inventory/test_inventory.py
+++ b/htsworkflow/frontend/inventory/test_inventory.py
@@ -1,6 +1,11 @@
 import RDF
 
 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
 
@@ -11,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
@@ -109,11 +114,11 @@ class InventoryTestCase(TestCase):
         return flowcells
 
 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")