From 3db9383dafdbeb6d50027c1ff5dda14babd23420 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 21 Feb 2011 00:08:07 +0000
Subject: [PATCH] [1.2.X] Fixed #15358 -- Renamed a test to avoid a naming
 collision. Thanks to mila for the report.

Backport of r15598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/gis/tests/geoapp/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py
index a2b81c64a2..a1f251ddda 100644
--- a/django/contrib/gis/tests/geoapp/tests.py
+++ b/django/contrib/gis/tests/geoapp/tests.py
@@ -699,7 +699,7 @@ class GeoModelTest(TestCase):
         self.assertEqual(tuple(coords), t.reverse_geom.coords)
         if oracle:
             self.assertRaises(TypeError, State.objects.reverse_geom)
-        
+
     @no_mysql
     @no_oracle
     @no_spatialite
@@ -718,7 +718,7 @@ class GeoModelTest(TestCase):
     @no_mysql
     @no_oracle
     @no_spatialite
-    def test29_force_rhr(self):
+    def test30_geohash(self):
         "Testing GeoQuerySet.geohash()."
         if not connection.ops.geohash: return
         # Reference query: