new test runner

tomi77 · Aug 16, 2016 · 128cd3d · 128cd3d
1 parent 198d7d0
commit 128cd3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ install:
   - pip install --upgrade mock
 
 script:
-  - coverage run ./manage.py test
+  - coverage run setup.py test
 
 after_success:
   - coveralls
diff --git a/manage.py b/manage.py
diff --git a/setup.py b/setup.py
@@ -40,5 +40,6 @@
     packages=find_packages(exclude=['testapp']),
     install_requires=[
         'django>=1.4'
-    ]
+    ],
+    test_suite='testapp.tests'
 )
diff --git a/testapp/tests.py b/testapp/tests.py
@@ -4,6 +4,10 @@
 
 import django
 
+os.environ['DJANGO_SETTINGS_MODULE'] = 'testapp.settings'
+if hasattr(django, 'setup'):
+    django.setup()
+
 try:
     from unittest.mock import patch, Mock
 except ImportError:
@@ -24,7 +28,7 @@ def get_result(self, command, **params):
 
 
 def load_test_data(filename):
-    return json.load(open(os.path.join('testapp', 'testdata', filename)))
+    return json.load(open(os.path.join(os.path.dirname(__file__), 'testdata', filename)))
 
 
 PULL_STREAM_TEST_DATA = load_test_data('pull_stream.json')