Support SSL in the regression tests. Fixes #2170

This commit is contained in:
Murtuza Zabuawala
2017-07-18 15:23:11 +01:00
committed by Dave Page
parent 6396b8ce18
commit bab3da24e6
55 changed files with 266 additions and 119 deletions

View File

@@ -58,6 +58,7 @@ class ResourceGroupsAddTestCase(BaseTestGenerator):
self.server['username'],
self.server['db_password'],
self.server['host'],
self.server['port'])
self.server['port'],
self.server['sslmode'])
resource_groups_utils.delete_resource_group(connection,
self.resource_group)

View File

@@ -60,6 +60,7 @@ class ResourceGroupsDeleteTestCase(BaseTestGenerator):
self.server['username'],
self.server['db_password'],
self.server['host'],
self.server['port'])
self.server['port'],
self.server['sslmode'])
resource_groups_utils.delete_resource_group(connection,
self.resource_group)

View File

@@ -65,6 +65,7 @@ class ResourceGroupsPutTestCase(BaseTestGenerator):
self.server['username'],
self.server['db_password'],
self.server['host'],
self.server['port'])
self.server['port'],
self.server['sslmode'])
resource_groups_utils.delete_resource_group(connection,
self.resource_group_name)

View File

@@ -60,6 +60,7 @@ class ResourceGroupsGetTestCase(BaseTestGenerator):
self.server['username'],
self.server['db_password'],
self.server['host'],
self.server['port'])
self.server['port'],
self.server['sslmode'])
resource_groups_utils.delete_resource_group(connection,
self.resource_group)

View File

@@ -30,7 +30,8 @@ def create_resource_groups(server, resource_group_name):
server['username'],
server['db_password'],
server['host'],
server['port'])
server['port'],
server['sslmode'])
old_isolation_level = connection.isolation_level
connection.set_isolation_level(0)
pg_cursor = connection.cursor()
@@ -64,7 +65,8 @@ def verify_resource_group(server, resource_group_name):
server['username'],
server['db_password'],
server['host'],
server['port'])
server['port'],
server['sslmode'])
pg_cursor = connection.cursor()
pg_cursor.execute("SELECT * FROM edb_resource_group WHERE "
"rgrpname='%s'" % resource_group_name)