Fixed feature test issues

This commit is contained in:
Usman Muzaffar
2019-04-05 12:25:03 +05:30
committed by Akshay Joshi
parent f706f7ed0c
commit 5c4c09f237
5 changed files with 32 additions and 10 deletions

View File

@@ -6,6 +6,7 @@
# This software is released under the PostgreSQL Licence
#
##########################################################################
import random
from regression.python_test_utils import test_utils
from regression.feature_utils.base_feature_test import BaseFeatureTest
@@ -19,35 +20,39 @@ class CheckRoleMembershipControlFeatureTest(BaseFeatureTest):
dict())
]
role = ""
def before(self):
with test_utils.Database(self.server) as (connection, _):
if connection.server_version < 90100:
self.skipTest(
"Membership is not present in Postgres below PG v9.1")
# create role
self.role = "test_role" + str(random.randint(10000, 65535))
# Some test function is needed for debugger
test_utils.create_role(self.server, "postgres",
"test_role")
self.role)
test_utils.create_role(self.server, "postgres",
"<h1>test</h1>")
def runTest(self):
self.page.wait_for_spinner_to_disappear()
self.page.add_server(self.server)
self._role_node_expandable()
self._role_node_expandable(self.role)
self._check_role_membership_control()
def after(self):
self.page.remove_server(self.server)
test_utils.drop_role(self.server, "postgres",
"test_role")
self.role)
test_utils.drop_role(self.server, "postgres",
"<h1>test</h1>")
def _role_node_expandable(self):
def _role_node_expandable(self, role):
self.page.toggle_open_server(self.server['name'])
self.page.toggle_open_tree_item('Login/Group Roles')
self.page.select_tree_item("test_role")
self.page.select_tree_item(role)
def _check_role_membership_control(self):
self.page.driver.find_element_by_link_text("Object").click()

View File

@@ -8,6 +8,8 @@
##########################################################################
import sys
import random
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils
from pgadmin.utils import server_utils
@@ -56,7 +58,8 @@ class TestSQLASCIIEncoding(BaseTestGenerator):
]
def setUp(self):
self.encode_db_name = 'test_encoding_' + self.db_encoding
self.encode_db_name = 'test_encoding_' + self.db_encoding + \
str(random.randint(1000, 65535))
self.encode_sid = self.server_information['server_id']
server_con = server_utils.connect_server(self, self.encode_sid)