Adapt to django-testscenarios 0.6release-0.2.5

7 files changed, 11 insertions, 8 deletions

diff --git a/test_project/__init__.py b/django_restricted_resource/test_project/__init__.py
index ed5c83d..ed5c83d 100644
--- a/test_project/__init__.py
+++ b/django_restricted_resource/test_project/__init__.py
diff --git a/test_project/manage.py b/django_restricted_resource/test_project/manage.py
index 6c0caae..6c0caae 100755
--- a/test_project/manage.py
+++ b/django_restricted_resource/test_project/manage.py
diff --git a/test_project/settings.py b/django_restricted_resource/test_project/settings.py
index 89a815a..89a815a 100644
--- a/test_project/settings.py
+++ b/django_restricted_resource/test_project/settings.py
diff --git a/test_project/tests.py b/django_restricted_resource/test_project/tests.py
index 2f4e011..09092e0 100644
--- a/test_project/tests.py
+++ b/django_restricted_resource/test_project/tests.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# Copyright (C) 2010 Linaro Limited
+# Copyright (C) 2010, 2011 Linaro Limited
 #
 # Author: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
 #
@@ -18,7 +17,11 @@
 # along with django-restricted-resource.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from django_testproject.tests import run_tests
+from django_testproject.tests import run_tests_for
+
+
+def run_tests():
+    return run_tests_for("django_restricted_resource.test_project.settings")
 
 
 if __name__ == '__main__':
diff --git a/django_restricted_resource/test_utils.py b/django_restricted_resource/test_utils.py
index 846df8e..16a8f55 100644
--- a/django_restricted_resource/test_utils.py
+++ b/django_restricted_resource/test_utils.py
@@ -21,7 +21,7 @@ import itertools
 
 from django.contrib.auth.models import (AnonymousUser, User, Group)
 from django.db import models
-from django_testscenarios import (TestCase, TestCaseWithScenarios)
+from django_testscenarios.ubertest import (TestCase, TestCaseWithScenarios)
 
 from django_restricted_resource.models import RestrictedResource
 
diff --git a/django_restricted_resource/tests.py b/django_restricted_resource/tests.py
index d474e35..fb9ae2b 100644
--- a/django_restricted_resource/tests.py
+++ b/django_restricted_resource/tests.py
@@ -23,7 +23,7 @@ Unit tests for django_restricted_resource application
 from django.contrib.auth.models import (AnonymousUser, User, Group)
 from django.core.exceptions import ValidationError
 
-from django_testscenarios import TestCaseWithScenarios
+from django_testscenarios.ubertest import TestCaseWithScenarios
 from django_restricted_resource.test_utils import (
     ExampleRestrictedResource,
     FixtureHelper,
diff --git a/setup.py b/setup.py
index c48c305..126bd55 100755
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,12 @@ from setuptools import setup
 
 setup(
     name = 'django-restricted-resource',
-    version = "0.2.4",
+    version = "0.2.5",
     author = "Zygmunt Krynicki",
     author_email = "zygmunt.krynicki@linaro.org",
     description = "Base model for Django that adds simple and efficient ownership and access control.",
     url = 'https://launchpad.net/django-restricted-resource',
-    test_suite = 'test_project.tests.run_tests',
+    test_suite = 'django_restricted_resource.test_project.tests.run_tests',
     license='LGPLv3',
     keywords = ['django', 'ownership', 'models'],
     classifiers = [
@@ -45,6 +45,6 @@ setup(
         'django >= 1.0',
     ],
     tests_require=[
-        'django-testscenarios >= 0.5',
+        'django-testscenarios >= 0.6',
     ],
 )