diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2011-11-27 10:31:26 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2011-11-27 10:31:26 +0000 |
| commit | 02bc523b89ae6fb37c26ce8d6424cb84751ad3ac (patch) | |
| tree | 1b31ae2132f0061e053a557cc46b68e8439dc756 | |
| parent | e4919f64b09a1813d5f1b4854f8b7c6e3a3c7a9a (diff) | |
Renamed the fixtures used by the aggregation tests so they're only loaded by the tests that use them. Refs #17275.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/modeltests/aggregation/fixtures/aggregation.json (renamed from tests/modeltests/aggregation/fixtures/initial_data.json) | 0 | ||||
| -rw-r--r-- | tests/modeltests/aggregation/tests.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json (renamed from tests/regressiontests/aggregation_regress/fixtures/initial_data.json) | 0 | ||||
| -rw-r--r-- | tests/regressiontests/aggregation_regress/tests.py | 2 |
4 files changed, 3 insertions, 1 deletions
diff --git a/tests/modeltests/aggregation/fixtures/initial_data.json b/tests/modeltests/aggregation/fixtures/aggregation.json index a0021001e7..a0021001e7 100644 --- a/tests/modeltests/aggregation/fixtures/initial_data.json +++ b/tests/modeltests/aggregation/fixtures/aggregation.json diff --git a/tests/modeltests/aggregation/tests.py b/tests/modeltests/aggregation/tests.py index 6c1c608d80..a35dbb345f 100644 --- a/tests/modeltests/aggregation/tests.py +++ b/tests/modeltests/aggregation/tests.py @@ -10,7 +10,7 @@ from .models import Author, Publisher, Book, Store class BaseAggregateTestCase(TestCase): - fixtures = ["initial_data.json"] + fixtures = ["aggregation.json"] def test_empty_aggregate(self): self.assertEqual(Author.objects.all().aggregate(), {}) diff --git a/tests/regressiontests/aggregation_regress/fixtures/initial_data.json b/tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json index 597ac041f7..597ac041f7 100644 --- a/tests/regressiontests/aggregation_regress/fixtures/initial_data.json +++ b/tests/regressiontests/aggregation_regress/fixtures/aggregation_regress.json diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py index 1498f19312..36a54c0b17 100644 --- a/tests/regressiontests/aggregation_regress/tests.py +++ b/tests/regressiontests/aggregation_regress/tests.py @@ -13,6 +13,8 @@ from .models import Author, Book, Publisher, Clues, Entries, HardbackBook class AggregationTests(TestCase): + fixtures = ["aggregation_regress.json"] + def assertObjectAttrs(self, obj, **kwargs): for attr, value in kwargs.iteritems(): self.assertEqual(getattr(obj, attr), value) |