Merge pull request #346 from infoxchange/use-custom-test-runner

Use a custom TEST_RUNNER

lettuce/django/management/commands/harvest.py

@@ -123,8 +123,8 @@ class Command(BaseCommand):
                 migrate_south = False
                 pass
 
-            from django.test.simple import DjangoTestSuiteRunner
-            self._testrunner = DjangoTestSuiteRunner()
+            from django.test.utils import get_runner
+            self._testrunner = get_runner(settings)(interactive=False)
             self._testrunner.setup_test_environment()
             self._old_db_config = self._testrunner.setup_databases()
 

tests/integration/django/alfaces/settings.py

@@ -15,4 +15,5 @@ INSTALLED_APPS = (
     'lettuce.django',
     'donothing', 
     'foobar',   
-)
+)
\ No newline at end of file
+SECRET_KEY = 'secret'

tests/integration/django/brocolis/leaves/test_runner.py

+from django.test.simple import DjangoTestSuiteRunner
+
+class TestRunner(DjangoTestSuiteRunner):
+    def setup_test_environment(self, **kwargs):
+        super(TestRunner, self).setup_test_environment(**kwargs)
+        print "Custom test runner enabled."

tests/integration/django/brocolis/settings.py

@@ -15,3 +15,5 @@ INSTALLED_APPS = (
     'lettuce.django',
     'leaves',
 )
+TEST_RUNNER = 'leaves.test_runner.TestRunner'
+SECRET_KEY = 'secret'

tests/integration/test_brocolis.py

@@ -58,3 +58,17 @@ def test_harvest_sets_environment_variabled_for_gae():
     assert_equals(status, 0, out)
 
     FileSystem.popd()
+
+
+def test_harvest_uses_test_runner():
+    'harvest uses TEST_RUNNER specified in settings'
+
+    FileSystem.pushd(current_directory, "django", "brocolis")
+
+    status, out = commands.getstatusoutput(
+        "python manage.py harvest -T leaves/features/disabled.feature")
+
+    assert_equals(status, 0, out)
+    assert "Custom test runner enabled." in out
+
+    FileSystem.popd()