From bebfc627218eccce596caf8fea69eae14682ca7c Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Thu, 3 Aug 2017 16:46:20 +0530 Subject: [PATCH] Fixed collation tests on Windows, replace use of default 'POSIX' collation with 'C' collation for testing. Fixes #2501 --- .../databases/schemas/collations/tests/test_collation_add.py | 2 +- .../servers/databases/schemas/collations/tests/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py index ee283aa8e..84b81e7d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py @@ -58,7 +58,7 @@ class CollationAddTestCase(BaseTestGenerator): raise Exception("Could not find the schema to add the collation.") data = { - "copy_collation": "pg_catalog.\"POSIX\"", + "copy_collation": "pg_catalog.\"C\"", "name": "collation_add_%s" % str(uuid.uuid4())[1:6], "owner": self.server["username"], "schema": schema_name diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py index 7a5578589..c24eb7902 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py @@ -25,7 +25,7 @@ def create_collation(server, schema_name, coll_name, db_name): server['port'], server['sslmode']) pg_cursor = connection.cursor() - pg_cursor.execute('CREATE COLLATION %s.%s FROM pg_catalog."POSIX"' % + pg_cursor.execute('CREATE COLLATION %s.%s FROM pg_catalog."C"' % (schema_name, coll_name)) connection.commit()