From 8849a95f30ed391b8a7ffd723ef26808993e8dbc Mon Sep 17 00:00:00 2001 From: Mitar Date: Sun, 29 Dec 2013 15:59:01 +0100 Subject: [PATCH] Support for running tests on Python 2.6. --- .travis.yml | 2 -- nodewatcher/test_runner.py | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1ce33038..c97e387f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,8 @@ before_install: install: - pip install pep8 --use-mirrors - pip install https://github.com/lamby/django-lint/archive/master.zip pylint --use-mirrors - - pip uninstall --yes unittest2 - pip install -r requirements.txt --use-mirrors before_script: - - find / -name postgis.sql || true - curl https://raw.github.com/django/django/1.5.1/docs/ref/contrib/gis/install/create_template_postgis-debian.sh | sh - createdb -T template_postgis nodewatcher - pep8 nodewatcher diff --git a/nodewatcher/test_runner.py b/nodewatcher/test_runner.py index b8890931d..7c10d876f 100644 --- a/nodewatcher/test_runner.py +++ b/nodewatcher/test_runner.py @@ -1,6 +1,8 @@ +import unittest + from django.conf import settings from django.test import simple, testcases -from django.utils import unittest +from django.utils import unittest as django_unittest class FilteredTestSuiteRunner(simple.DjangoTestSuiteRunner): @@ -16,10 +18,10 @@ def _filter_suite(self, suite): # We do NOT filter if filters are not set return suite - filtered = unittest.TestSuite() + filtered = django_unittest.TestSuite() for test in suite: - if isinstance(test, unittest.TestSuite): + if isinstance(test, (unittest.TestSuite, django_unittest.TestSuite)): filtered.addTests(self._filter_suite(test)) else: for f in filters: