Merge lp:~ricardokirkner/ols-tests-django/support-django-1.10 into lp:ols-tests-django

[Ricardo Kirkner]

return different results from setup_databases depending on django version

[Vincent Ladeuil (vila)]

Small nit but excellent work otherwise, thanks !

Approving assuming you agree with the nit so you can land otherwise, let's talk ;-)

Ha hmm, almost there, running tox (as ci will d) fails:

ERROR: py2.7-django-1.11: commands failed

ImportError: No module named django

Makefile:8: recipe for target 'test' failed
make: *** [test] Error 1
ERROR: InvocationError: '/usr/bin/make test'

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/ols-tests-django/2/

[lp:~ricardokirkner/ols-tests-django/support-django-1.10]

26. By Ricardo Kirkner on 2017-04-07

fixed syntax for old tox 1.6.0 (used in CI)

27. By Ricardo Kirkner on 2017-04-07

bump version

=== modified file 'olstestsdjango/runner.py'
--- olstestsdjango/runner.py	2016-06-09 12:31:32 +0000
+++ olstestsdjango/runner.py	2017-04-07 13:55:21 +0000
@@ -14,6 +14,7 @@
 
 
 with_argparse = django.VERSION[0:2] >= (1, 8)
+setup_databases_returns_mirrors = django.VERSION[0:2] < (1, 9)
 
 
 def set_trace():
@@ -138,7 +139,10 @@
         """
         # Return an empty but valid value so teardown_databases does nothing
         # when invoked from the base class run_suite().
-        return ([], [])
+        if setup_databases_returns_mirrors:
+            return ([], [])
+        else:
+            return []
 
     def build_suite(self, test_labels=None, extra_tests=None, **kwargs):
         if not test_labels:

=== modified file 'olstestsdjango/tests/test_runner.py'
--- olstestsdjango/tests/test_runner.py	2016-06-09 12:31:32 +0000
+++ olstestsdjango/tests/test_runner.py	2017-04-07 13:55:21 +0000
@@ -4,7 +4,7 @@
 import unittest
 from cStringIO import StringIO
 
-
+import django
 from django.core import management
 from olstests import (
     filters,
@@ -121,6 +121,23 @@
         self.run_test(['--pick', '1/2'])
         self.assertEqual([1, 2], self.runner.pick)
 
+    @unittest.skipIf(runner.setup_databases_returns_mirrors,
+                     'Test is not compatible with django 1.8 or earlier')
+    def test_setup_databases_when_setup_does_not_return_mirrors(self):
+        old_config = runner.TestRunner().setup_databases()
+        self.assertEqual(old_config, [])
+
+    @unittest.skipUnless(runner.setup_databases_returns_mirrors,
+                         'Test is not compatible with django 1.9 or later')
+    def test_setup_databases_when_setup_returns_mirrors(self):
+        old_config = runner.TestRunner().setup_databases()
+        self.assertEqual(old_config, ([], []))
+
+    def test_setup_databases_returns_mirrors(self):
+        self.assertEqual(
+            runner.setup_databases_returns_mirrors,
+            django.VERSION[0:2] < (1, 9))
+
 
 class TestBuildSuite(unittest.TestCase):
 

=== modified file 'setup.py'
--- setup.py	2016-01-07 13:04:45 +0000
+++ setup.py	2017-04-07 13:55:21 +0000
@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name='ols-tests-django',
-    version='0.0.1',
+    version='0.0.2',
     license='GPLv3',
     description='Online Services django test modules',
     author='Vincent Ladeuil',

=== modified file 'tox.ini'
--- tox.ini	2016-05-12 13:38:23 +0000
+++ tox.ini	2017-04-07 13:55:21 +0000
@@ -1,7 +1,9 @@
 [tox]
 envlist =
-    py2.7-django1.6, py2.7-django1.7, py2.7-django1.8, py2.7-django1.9,
+    py2.7-django1.6, py2.7-django1.7, py2.7-django1.8, py2.7-django1.9, py2.7-django1.10, py2.7-django1.11,
+    py3-django1.11,
     pay-precise, sca-trusty, sso-trusty
+
 [testenv]
 basepython = python2.7
 commands = make test
@@ -35,6 +37,16 @@
     django >= 1.9, < 1.10
     {[testenv]deps}
 
+[testenv:py2.7-django1.10]
+deps =
+    django >= 1.10, < 1.11
+    {[testenv]deps}
+
+[testenv:py2.7-django1.11]
+deps =
+    django >= 1.11, < 1.12
+    {[testenv]deps}
+
 [testenv:pay-precise]
 deps =
     django >= 1.6, < 1.7
@@ -56,3 +68,11 @@
     {[testenv]deps}
     testtools==0.9.34
     python-subunit==1.1.0
+
+[testenv:py3]
+basepython = python3
+
+[testenv:py3-django1.11]
+deps =
+    django >= 1.11, < 1.12
+    {[testenv]deps}