IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Final PEP-8 fixes

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2018-03-08 09:33:43 +00:00
committed by Dave Page
parent f86c313c18
commit 3a6994f719
71 changed files with 1208 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py
View File

@@ -14,16 +14,16 @@ from regression.python_test_utils import test_utils
class TestSSLConnection(BaseTestGenerator):
"""This will check if SSL is used in our database connection"""
scenarios = [
("Test for SSL connection", dict())
('Test for SSL connection', dict())
]
def runTest(self):
if hasattr(self, "ignore_test"):
if hasattr(self, 'ignore_test'):
return
supported_modes = ['require', 'verify-ca', 'verify-full']
if self.server['sslmode'] in supported_modes:
with test_utils.Database(self.server) as (
connection, database_name
connection, database_name
):
cursor = connection.cursor()
@@ -33,7 +33,6 @@ class TestSSLConnection(BaseTestGenerator):
is_ssl_used = cursor.fetchone()[0]
self.assertEquals(True, is_ssl_used)
else:
self.skipTest("Cannot run SSL connection check test "
"with '{0}' sslmode".format(
self.server['sslmode']
))
self.skipTest(
'Cannot run SSL connection check test '
'with \'{0}\' sslmode'.format(self.server['sslmode']))

9
web/pgadmin/browser/server_groups/servers/tests/test_dependencies_sql.py
View File

@@ -9,7 +9,8 @@
import os
from regression.python_test_utils.sql_template_test_base import SQLTemplateTestBase
from regression.python_test_utils.sql_template_test_base import \
SQLTemplateTestBase
from regression.python_test_utils.template_helper import file_as_template
@@ -32,7 +33,8 @@ class TestDependenciesSql(SQLTemplateTestBase):
def generate_sql(self, version):
template_file = self.get_template_file(version, "dependencies.sql")
template = file_as_template(template_file)
sql = template.render(where_clause="WHERE dep.objid=%s::oid" % self.table_id)
sql = template.render(
where_clause="WHERE dep.objid=%s::oid" % self.table_id)
return sql
@@ -48,4 +50,5 @@ class TestDependenciesSql(SQLTemplateTestBase):
@staticmethod
def get_template_file(version, filename):
return os.path.join(os.path.dirname(__file__), "..", "templates", "depends", "sql", version, filename)
return os.path.join(os.path.dirname(__file__), "..", "templates",
"depends", "sql", version, filename)

9
web/pgadmin/browser/server_groups/servers/tests/test_dependents_sql.py
View File

@@ -9,7 +9,8 @@
import os
from regression.python_test_utils.sql_template_test_base import SQLTemplateTestBase
from regression.python_test_utils.sql_template_test_base import \
SQLTemplateTestBase
from regression.python_test_utils.template_helper import file_as_template
@@ -32,7 +33,8 @@ class TestDependentsSql(SQLTemplateTestBase):
def generate_sql(self, version):
template_file = self.get_template_file(version, "dependents.sql")
template = file_as_template(template_file)
sql = template.render(where_clause="WHERE dep.objid=%s::oid" % self.table_id)
sql = template.render(
where_clause="WHERE dep.objid=%s::oid" % self.table_id)
return sql
@@ -48,4 +50,5 @@ class TestDependentsSql(SQLTemplateTestBase):
@staticmethod
def get_template_file(version, filename):
return os.path.join(os.path.dirname(__file__), "..", "templates", "depends", "sql", version, filename)
return os.path.join(os.path.dirname(__file__), "..", "templates",
"depends", "sql", version, filename)

17
web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py
View File

@@ -6,14 +6,11 @@
# This software is released under the PostgreSQL Licence
#
##########################################################################
from pgadmin.browser.server_groups.servers.roles.tests.utils import create_role, delete_role
from pgadmin.utils.route import BaseTestGenerator
import os
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils
from regression.python_test_utils.sql_template_test_base import SQLTemplateTestBase
from regression.python_test_utils.template_helper import file_as_template
from regression.python_test_utils.test_utils import create_database
class TestRoleDependenciesSql(BaseTestGenerator):
@@ -45,7 +42,8 @@ class TestRoleDependenciesSql(BaseTestGenerator):
return
with test_utils.Database(self.server) as (connection, database_name):
test_utils.create_table(self.server_with_modified_user, database_name, "test_new_role_table")
test_utils.create_table(self.server_with_modified_user,
database_name, "test_new_role_table")
cursor = connection.cursor()
cursor.execute("SELECT pg_class.oid AS table_id "
"FROM pg_class "
@@ -65,9 +63,11 @@ class TestRoleDependenciesSql(BaseTestGenerator):
connection.commit()
def generate_sql(self, version):
template_file = self.get_template_file(version, "role_dependencies.sql")
template_file = self.get_template_file(version,
"role_dependencies.sql")
template = file_as_template(template_file)
sql = template.render(where_clause="WHERE dep.objid=%s::oid" % self.table_id)
sql = template.render(
where_clause="WHERE dep.objid=%s::oid" % self.table_id)
return sql
@@ -82,4 +82,5 @@ class TestRoleDependenciesSql(BaseTestGenerator):
@staticmethod
def get_template_file(version, filename):
return os.path.join(os.path.dirname(__file__), "..", "templates", "depends", "sql", version, filename)
return os.path.join(os.path.dirname(__file__), "..", "templates",
"depends", "sql", version, filename)