From ba0b819936b2ed9a91f0e7020c8dafd1ff3d15c8 Mon Sep 17 00:00:00 2001 From: Steve Lamb Date: Wed, 12 Mar 2014 16:34:46 -0400 Subject: [PATCH] Support pre django1.6 method of test discovery fixes #45 on github. b71ea63390aee61e1bb6484cb07baffd663bdea6 started using a test discovery method introduced in 1.6, but the library supports and tests on 1.5. The method used works with both 1.5 and 1.6 (which introduced backward-incompatible changes). You have a tests/ package with files that begin with test_. --- test_app/djqscsv_tests/tests/__init__.py | 2 ++ test_app/djqscsv_tests/{ => tests}/test_csv_creation.py | 8 ++++---- test_app/djqscsv_tests/{ => tests}/test_utilities.py | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 test_app/djqscsv_tests/tests/__init__.py rename test_app/djqscsv_tests/{ => tests}/test_csv_creation.py (97%) rename test_app/djqscsv_tests/{ => tests}/test_utilities.py (96%) diff --git a/test_app/djqscsv_tests/tests/__init__.py b/test_app/djqscsv_tests/tests/__init__.py new file mode 100644 index 0000000..7b9f4d7 --- /dev/null +++ b/test_app/djqscsv_tests/tests/__init__.py @@ -0,0 +1,2 @@ +from test_csv_creation import * +from test_utilities import * diff --git a/test_app/djqscsv_tests/test_csv_creation.py b/test_app/djqscsv_tests/tests/test_csv_creation.py similarity index 97% rename from test_app/djqscsv_tests/test_csv_creation.py rename to test_app/djqscsv_tests/tests/test_csv_creation.py index 82c6fdc..43f1914 100644 --- a/test_app/djqscsv_tests/test_csv_creation.py +++ b/test_app/djqscsv_tests/tests/test_csv_creation.py @@ -6,13 +6,13 @@ import csv import itertools -from .context import djqscsv +from djqscsv_tests.context import djqscsv -from .context import SELECT, EXCLUDE, AS +from djqscsv_tests.context import SELECT, EXCLUDE, AS -from .models import Person +from djqscsv_tests.models import Person -from .util import create_people_and_get_queryset +from djqscsv_tests.util import create_people_and_get_queryset from django.utils import six diff --git a/test_app/djqscsv_tests/test_utilities.py b/test_app/djqscsv_tests/tests/test_utilities.py similarity index 96% rename from test_app/djqscsv_tests/test_utilities.py rename to test_app/djqscsv_tests/tests/test_utilities.py index 4e7b310..1cbcdfa 100644 --- a/test_app/djqscsv_tests/test_utilities.py +++ b/test_app/djqscsv_tests/tests/test_utilities.py @@ -1,9 +1,9 @@ from django.test import TestCase from django.core.exceptions import ValidationError -from .context import djqscsv +from djqscsv_tests.context import djqscsv -from .util import create_people_and_get_queryset +from djqscsv_tests.util import create_people_and_get_queryset # Test the various helper functions that assist the # csv creation process, but don't participate in it