From 4abfa73c1861c53d43f0448726346866b04b9b72 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 31 Dec 2014 11:25:11 -0500
Subject: [PATCH] [1.7.x] Renamed tests for util -> utils moves; refs #17627.

Backport of 8a9b0c15a6c0ef60dea3ba3042317520bc201206 from master
---
 tests/{admin_util => admin_utils}/__init__.py           | 0
 tests/{admin_util => admin_utils}/models.py             | 0
 tests/{admin_util => admin_utils}/tests.py              | 2 +-
 tests/forms_tests/tests/{test_util.py => test_utils.py} | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/{admin_util => admin_utils}/__init__.py (100%)
 rename tests/{admin_util => admin_utils}/models.py (100%)
 rename tests/{admin_util => admin_utils}/tests.py (99%)
 rename tests/forms_tests/tests/{test_util.py => test_utils.py} (99%)

diff --git a/tests/admin_util/__init__.py b/tests/admin_utils/__init__.py
similarity index 100%
rename from tests/admin_util/__init__.py
rename to tests/admin_utils/__init__.py
diff --git a/tests/admin_util/models.py b/tests/admin_utils/models.py
similarity index 100%
rename from tests/admin_util/models.py
rename to tests/admin_utils/models.py
diff --git a/tests/admin_util/tests.py b/tests/admin_utils/tests.py
similarity index 99%
rename from tests/admin_util/tests.py
rename to tests/admin_utils/tests.py
index 20980efffa..3318981a23 100644
--- a/tests/admin_util/tests.py
+++ b/tests/admin_utils/tests.py
@@ -91,7 +91,7 @@ class NestedObjectsTests(TestCase):
         n.collect([Vehicle.objects.first()])
 
 
-class UtilTests(SimpleTestCase):
+class UtilsTests(SimpleTestCase):
     def test_values_from_lookup_field(self):
         """
         Regression test for #12654: lookup_field
diff --git a/tests/forms_tests/tests/test_util.py b/tests/forms_tests/tests/test_utils.py
similarity index 99%
rename from tests/forms_tests/tests/test_util.py
rename to tests/forms_tests/tests/test_utils.py
index c2dbc5ba8a..f909bb9893 100644
--- a/tests/forms_tests/tests/test_util.py
+++ b/tests/forms_tests/tests/test_utils.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy
 from django.utils.encoding import python_2_unicode_compatible
 
 
-class FormsUtilTestCase(TestCase):
+class FormsUtilsTestCase(TestCase):
     # Tests for forms/utils.py module.
 
     def test_flatatt(self):