Merge pull request #72 from pybee/pytest

Add a PyTest backend for cricket.

.gitignore

@@ -4,12 +4,14 @@
 # Tests
 .coverage
 .tox
+.pytest_cache
 
 # Distribution
 env/
 dist/
 build/
 *.egg-info
+.eggs
 _build
 distribute-*
 

beekeeper.yml

@@ -8,6 +8,8 @@ pull_request:
     - smoke-test:
         task: py35
         name: Smoke build (Python 3.5)
+        environment:
+            EXTRA_REQUIRES: pytest>=3.6 django~=1.11
     # - full-test:
     #     subtasks:
     #         - py3.5:
@@ -18,5 +20,5 @@ pull_request:
     #             task: py36
 push:
     - smoke-test:
-        task: py34
-        name: Smoke build (Python 3.4)
+        task: py35
+        name: Smoke build (Python 3.5)

cricket/app.py

@@ -20,7 +20,6 @@ def main(Model):
 
     parser.add_argument("--version", help="Display version number and exit", action="store_true")
 
-    Model.add_arguments(parser)
     options = parser.parse_args()
 
     # Check the shortcut options

cricket/django/__main__.py

@@ -1,13 +1,17 @@
 '''
 This is the main entry point for running Django test suites.
 '''
-from cricket.main import main as cricket_main
+from cricket.app import main as cricket_main
 from cricket.django.model import DjangoTestSuite
 
 
 def main():
     return cricket_main(DjangoTestSuite)
 
 
-if __name__ == "__main__":
+def run():
     main().main_loop()
+
+
+if __name__ == "__main__":
+    run()

cricket/django/discoverer.py

@@ -1,12 +1,6 @@
-from __future__ import absolute_import
-
 import unittest
 
 from django.conf import settings
-try:
-    from django.test.simple import DjangoTestSuiteRunner
-except ImportError:
-    DjangoTestSuiteRunner = None
 from django.test.utils import get_runner
 
 # Dynamically retrieve the test runner class for this project.
@@ -20,17 +14,8 @@ class TestDiscoverer(TestRunnerClass):
     """
     def _output_suite(self, suite):
         for test in suite:
-            # Django 1.6 introduce the new-style test runner.
-            # If that test runner is in use, we use the full test name.
-            # If we're still using a pre 1.6-style runner, we need to
-            # drop out all everything between the app name and the test module.
             if isinstance(test, unittest.TestSuite):
                 self._output_suite(test)
-            elif (DjangoTestSuiteRunner
-                  and issubclass(TestRunnerClass, DjangoTestSuiteRunner)):
-                parts = test.id().split('.')
-                tests_index = parts.index('tests')
-                print('%s.%s.%s' % (parts[tests_index - 1], parts[-2], parts[-1]))
             else:
                 print(test.id())
 

cricket/django/django_runtests.py

@@ -1,10 +1,12 @@
-#!/usr/bin/env python
+# A command line tool that passes in a custom runner for running
+# Django's own internal unit tests.
+import importlib
 import os
 import warnings
 import argparse
 
-from django.utils import importlib
-
+# This is Django's runtest module
+# (the one you use to run Django's test suite)
 import runtests
 
 

cricket/django/executor.py

@@ -24,14 +24,7 @@ class TestExecutor(TestRunnerClass):
     Formats output in a machine-readable format.
     """
     def run_suite(self, suite, **kwargs):
-        # Django 1.6 introduce the new-style test runner.
-        # If that test runner is in use, we use the full test name.
-        # If we're still using a pre 1.6-style runner, we need to
-        # drop out all everything between the app name and the test module.
-        use_old_discovery = (DjangoTestSuiteRunner and
-                             issubclass(TestRunnerClass, DjangoTestSuiteRunner))
-
-        return PipedTestRunner(use_old_discovery=use_old_discovery).run(suite)
+        return PipedTestRunner().run(suite)
 
 
 class TestCoverageExecutor(TestExecutor):

cricket/django/model.py

@@ -6,7 +6,7 @@
 import os
 import sys
 
-from cricket.model import TestSuite
+from cricket.model import TestSuite, TestModule, TestCase, TestMethod
 
 
 class DjangoTestSuite(TestSuite):
@@ -72,3 +72,20 @@ def execute_commandline(self, labels):
         command.extend(labels)
 
         return command
+
+    def split_test_id(self, test_id):
+        pathparts = test_id.split('.')
+
+        return [
+            (TestModule, part)
+            for part in pathparts[:-2]
+        ] + [
+            (TestCase, pathparts[-2]),
+            (TestMethod, pathparts[-1]),
+        ]
+
+    def join_path(self, parent, klass, part):
+        if parent.path is None:
+            return part
+        else:
+            return '{}.{}'.format(parent.path, part)

cricket/executor.py

@@ -187,7 +187,7 @@ async def run(self, count, labels):
                         try:
                             # No active test; first line tells us which test is running.
                             pre = json.loads(line)
-                            self.current_test = self.test_suite.confirm_exists(pre['path'])
+                            self.current_test = self.test_suite.put_test(pre['path'])
 
                             # Update the display
                             if self.display: