From: Adrien Berchet <adrien.berchet@gmail.com>
Date: Mon, 15 Apr 2019 08:45:51 +0000 (+0200)
Subject: Fix tests.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4570%2Fhead;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix tests.
---

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 32c9149ad7..cb503892c8 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -93,7 +93,7 @@ def register_function(identifier, fn, package="_default"):
                 "different letter cases and might interact with '{}'. "
                 "GenericFunction objects will be fully case-insensitive in a "
                 "future release.".format(
-                    list(case_sensitive_reg[identifier].keys()),
+                    sorted(case_sensitive_reg[identifier].keys()),
                     raw_identifier))
 
         else:
diff --git a/test/sql/test_deprecations.py b/test/sql/test_deprecations.py
index 05698c78a8..08a862e437 100644
--- a/test/sql/test_deprecations.py
+++ b/test/sql/test_deprecations.py
@@ -41,15 +41,6 @@ from sqlalchemy.testing import not_in_
 class DeprecationWarningsTest(fixtures.TestBase):
     __backend__ = True
 
-    def setup(self):
-        self._registry = deepcopy(functions._registry)
-        self._case_sensitive_registry = deepcopy(
-            functions._case_sensitive_registry)
-
-    def teardown(self):
-        functions._registry = self._registry
-        functions._case_sensitive_registry = self._case_sensitive_registry
-
     def test_ident_preparer_force(self):
         preparer = testing.db.dialect.identifier_preparer
         preparer.quote("hi")
@@ -155,6 +146,20 @@ class DeprecationWarningsTest(fixtures.TestBase):
                 autoload_with=testing.db,
             )
 
+
+class CaseSensitiveFunctionDeprecationsTest(fixtures.TestBase):
+
+    def setup(self):
+        self._registry = deepcopy(functions._registry)
+        self._case_sensitive_registry = deepcopy(
+            functions._case_sensitive_registry)
+        functions._registry.clear()
+        functions._case_sensitive_registry.clear()
+
+    def teardown(self):
+        functions._registry = self._registry
+        functions._case_sensitive_registry = self._case_sensitive_registry
+
     def test_case_sensitive(self):
         reg = functions._registry['_default']
         cs_reg = functions._case_sensitive_registry['_default']
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index 9f80727212..b03b156bc1 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -240,7 +240,6 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
         assert isinstance(func.myfunc().type, DateTime)
 
     def test_replace_function(self):
-
         class replaceable_func(GenericFunction):
             type = Integer
             identifier = 'replaceable_func'