From 8d2dff14822a3735cee42a9de1821bfe6d368263 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 18 Oct 2016 11:57:31 +0100 Subject: [PATCH] Always create databases from template0 when running regression tests, to ensure consistency and avoid concurrency issues. --- .../server_groups/servers/databases/tests/test_db_add.py | 1 + .../browser/server_groups/servers/databases/tests/utils.py | 2 +- web/regression/test_utils.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py index c766f5e52..bd56ce36e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py @@ -34,6 +34,7 @@ class DatabaseAddTestCase(BaseTestGenerator): if server_response["info"] == "Server connected.": db_owner = server_response['data']['user']['name'] self.data = database_utils.get_db_data(db_owner) + self.data['template'] = 'template0' self.db_name = self.data['name'] response = self.tester.post(self.url + str(utils.SERVER_GROUP) + "/" + str(self.server_id) + "/", diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py index 1e0f66b35..0a18dd6d4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py @@ -104,7 +104,7 @@ def create_database(connection, db_name): old_isolation_level = connection.isolation_level connection.set_isolation_level(0) pg_cursor = connection.cursor() - pg_cursor.execute('''CREATE DATABASE "%s"''' % db_name) + pg_cursor.execute('''CREATE DATABASE "%s" TEMPLATE template0''' % db_name) connection.set_isolation_level(old_isolation_level) connection.commit() return pg_cursor diff --git a/web/regression/test_utils.py b/web/regression/test_utils.py index 80cfd65a1..dcbeb94da 100644 --- a/web/regression/test_utils.py +++ b/web/regression/test_utils.py @@ -117,7 +117,7 @@ def create_database(server, db_name): old_isolation_level = connection.isolation_level connection.set_isolation_level(0) pg_cursor = connection.cursor() - pg_cursor.execute('''CREATE DATABASE "%s"''' % db_name) + pg_cursor.execute('''CREATE DATABASE "%s" TEMPLATE template0''' % db_name) connection.set_isolation_level(old_isolation_level) connection.commit()