From 10920404e146bc4b87100b65fc41ed29ab65e2cd Mon Sep 17 00:00:00 2001 From: Atira Odhner Date: Thu, 23 Mar 2017 11:59:31 +0000 Subject: [PATCH] Re-organised the regression directory now we have multiple test suites: move test_utils.py into python_test_utils/ --- .../databases/casts/tests/test_cast_add.py | 9 +- .../databases/casts/tests/test_cast_delete.py | 8 +- .../databases/casts/tests/test_cast_get.py | 11 +- .../databases/casts/tests/test_cast_put.py | 9 +- .../servers/databases/casts/tests/utils.py | 3 +- .../tests/test_event_trigger_add.py | 12 +- .../tests/test_event_trigger_delete.py | 10 +- .../tests/test_event_trigger_get.py | 10 +- .../tests/test_event_trigger_put.py | 12 +- .../databases/event_triggers/tests/utils.py | 3 +- .../extensions/tests/test_extension_add.py | 7 +- .../extensions/tests/test_extension_delete.py | 6 +- .../extensions/tests/test_extension_get.py | 6 +- .../extensions/tests/test_extension_put.py | 7 +- .../databases/extensions/tests/utils.py | 3 +- .../tests/test_foreign_servers_add.py | 13 +- .../tests/test_foreign_servers_delete.py | 9 +- .../tests/test_foreign_servers_get.py | 9 +- .../tests/test_foreign_servers_put.py | 13 +- .../foreign_servers/tests/utils.py | 4 +- .../tests/test_user_mapping_add.py | 19 +- .../tests/test_user_mapping_delete.py | 15 +- .../tests/test_user_mapping_get.py | 15 +- .../tests/test_user_mapping_put.py | 19 +- .../user_mapping/tests/utils.py | 3 +- .../tests/test_fdw_add.py | 9 +- .../tests/test_fdw_delete.py | 9 +- .../tests/test_fdw_get.py | 11 +- .../tests/test_fdw_put.py | 13 +- .../foreign_data_wrappers/tests/utils.py | 5 +- .../languages/tests/test_language_add.py | 7 +- .../languages/tests/test_language_delete.py | 7 +- .../languages/tests/test_language_get.py | 7 +- .../languages/tests/test_language_put.py | 7 +- .../databases/languages/tests/utils.py | 3 +- .../collations/tests/test_collation_add.py | 12 +- .../collations/tests/test_collation_delete.py | 10 +- .../collations/tests/test_collation_get.py | 10 +- .../collations/tests/test_collation_put.py | 12 +- .../schemas/collations/tests/utils.py | 7 +- .../schemas/domains/tests/test_domain_add.py | 12 +- .../domains/tests/test_domain_delete.py | 10 +- .../schemas/domains/tests/test_domain_get.py | 10 +- .../schemas/domains/tests/test_domain_put.py | 12 +- .../databases/schemas/domains/tests/utils.py | 7 +- .../tests/test_foreign_table_add.py | 17 +- .../tests/test_foreign_table_delete.py | 13 +- .../tests/test_foreign_table_get.py | 13 +- .../tests/test_foreign_table_put.py | 17 +- .../schemas/foreign_tables/tests/utils.py | 4 +- .../tests/test_fts_configuration_add.py | 19 +- .../tests/test_fts_configuration_delete.py | 11 +- .../tests/test_fts_configuration_get.py | 11 +- .../tests/test_fts_configuration_put.py | 15 +- .../schemas/fts_configurations/tests/utils.py | 6 +- .../tests/test_fts_dictionaries_add.py | 15 +- .../tests/test_fts_dictionaries_delete.py | 11 +- .../tests/test_fts_dictionaries_get.py | 11 +- .../tests/test_fts_dictionaries_put.py | 15 +- .../schemas/fts_dictionaries/tests/utils.py | 6 +- .../fts_parser/tests/test_fts_parser_add.py | 15 +- .../tests/test_fts_parser_delete.py | 11 +- .../fts_parser/tests/test_fts_parser_get.py | 11 +- .../fts_parser/tests/test_fts_parser_put.py | 15 +- .../schemas/fts_parser/tests/utils.py | 6 +- .../tests/test_fts_templates_add.py | 15 +- .../tests/test_fts_templates_delete.py | 11 +- .../tests/test_fts_templates_get.py | 11 +- .../tests/test_fts_templates_put.py | 15 +- .../schemas/fts_templates/tests/utils.py | 6 +- .../functions/tests/test_trigger_func_add.py | 12 +- .../tests/test_trigger_func_delete.py | 12 +- .../functions/tests/test_trigger_func_get.py | 12 +- .../functions/tests/test_trigger_func_put.py | 14 +- .../schemas/functions/tests/utils.py | 7 +- .../packages/tests/test_package_add.py | 14 +- .../packages/tests/test_package_delete.py | 12 +- .../packages/tests/test_package_get.py | 12 +- .../packages/tests/test_package_put.py | 14 +- .../databases/schemas/packages/tests/utils.py | 7 +- .../sequences/tests/test_sequence_add.py | 10 +- .../sequences/tests/test_sequence_delete.py | 10 +- .../sequences/tests/test_sequence_get.py | 10 +- .../sequences/tests/test_sequence_put.py | 13 +- .../schemas/sequences/tests/utils.py | 7 +- .../synonyms/tests/test_synonym_add.py | 14 +- .../synonyms/tests/test_synonym_delete.py | 12 +- .../synonyms/tests/test_synonym_get.py | 12 +- .../synonyms/tests/test_synonym_put.py | 18 +- .../databases/schemas/synonyms/tests/utils.py | 7 +- .../tables/column/tests/test_column_add.py | 14 +- .../tables/column/tests/test_column_delete.py | 14 +- .../tables/column/tests/test_column_get.py | 14 +- .../tables/column/tests/test_column_put.py | 16 +- .../schemas/tables/column/tests/utils.py | 7 +- .../tests/test_check_constraint_add.py | 14 +- .../tests/test_check_constraint_delete.py | 14 +- .../tests/test_check_constraint_get.py | 14 +- .../tests/test_check_constraint_put.py | 16 +- .../check_constraint/tests/utils.py | 7 +- .../foreign_key/tests/test_foreign_key_add.py | 14 +- .../tests/test_foreign_key_delete.py | 14 +- .../foreign_key/tests/test_foreign_key_get.py | 14 +- .../foreign_key/tests/test_foreign_key_put.py | 16 +- .../constraints/foreign_key/tests/utils.py | 7 +- .../tests/test_index_constraint_add.py | 14 +- .../tests/test_index_constraint_delete.py | 14 +- .../tests/test_index_constraint_get.py | 14 +- .../tests/test_index_constraint_put.py | 16 +- .../index_constraint/tests/utils.py | 7 +- .../tables/indexes/tests/test_indexes_add.py | 14 +- .../indexes/tests/test_indexes_delete.py | 18 +- .../tables/indexes/tests/test_indexes_get.py | 18 +- .../tables/indexes/tests/test_indexes_put.py | 20 +- .../schemas/tables/indexes/tests/utils.py | 7 +- .../tables/rules/tests/test_rules_add.py | 14 +- .../tables/rules/tests/test_rules_delete.py | 14 +- .../tables/rules/tests/test_rules_get.py | 14 +- .../tables/rules/tests/test_rules_put.py | 16 +- .../schemas/tables/rules/tests/utils.py | 7 +- .../column/sql/tests/test_column_acl.py | 2 +- .../sql/tests/test_column_properties.py | 2 +- .../sql/tests/test_foreign_key_properties.py | 2 +- .../table/sql/tests/test_tables_acl.py | 2 +- .../table/sql/tests/test_tables_node.py | 2 +- .../table/sql/tests/test_tables_properties.py | 2 +- .../trigger/sql/tests/test_trigger_get_oid.py | 2 +- .../trigger/sql/tests/test_trigger_nodes.py | 2 +- .../schemas/tables/tests/test_table_add.py | 13 +- .../schemas/tables/tests/test_table_delete.py | 10 +- .../schemas/tables/tests/test_table_get.py | 10 +- .../schemas/tables/tests/test_table_put.py | 12 +- .../databases/schemas/tables/tests/utils.py | 7 +- .../triggers/tests/test_triggers_add.py | 18 +- .../triggers/tests/test_triggers_delete.py | 18 +- .../triggers/tests/test_triggers_get.py | 18 +- .../triggers/tests/test_triggers_put.py | 20 +- .../schemas/tables/triggers/tests/utils.py | 7 +- .../schemas/tests/test_schema_add.py | 6 +- .../schemas/tests/test_schema_delete.py | 6 +- .../schemas/tests/test_schema_get.py | 8 +- .../schemas/tests/test_schema_put.py | 6 +- .../servers/databases/schemas/tests/utils.py | 9 +- .../schemas/types/tests/test_types_add.py | 10 +- .../schemas/types/tests/test_types_delete.py | 10 +- .../schemas/types/tests/test_types_get.py | 10 +- .../schemas/types/tests/test_types_put.py | 12 +- .../databases/schemas/types/tests/utils.py | 7 +- .../schemas/views/tests/test_views_add.py | 12 +- .../schemas/views/tests/test_views_delete.py | 12 +- .../schemas/views/tests/test_views_get.py | 12 +- .../schemas/views/tests/test_views_put.py | 14 +- .../databases/schemas/views/tests/utils.py | 7 +- .../servers/databases/tests/test_db_add.py | 6 +- .../servers/databases/tests/test_db_delete.py | 6 +- .../servers/databases/tests/test_db_get.py | 2 +- .../servers/databases/tests/test_db_put.py | 2 +- .../servers/databases/tests/utils.py | 2 +- .../tests/test_resource_groups_add.py | 8 +- .../tests/test_resource_groups_delete.py | 6 +- .../tests/test_resource_groups_put.py | 8 +- .../tests/tests_resource_groups_get.py | 6 +- .../servers/resource_groups/tests/utils.py | 3 +- .../servers/roles/tests/test_role_add.py | 6 +- .../servers/roles/tests/test_role_delete.py | 2 +- .../servers/roles/tests/test_role_get.py | 2 +- .../servers/roles/tests/test_role_put.py | 2 +- .../servers/roles/tests/utils.py | 7 +- .../tablespaces/tests/test_tbspc_add.py | 7 +- .../tablespaces/tests/test_tbspc_delete.py | 5 +- .../tablespaces/tests/test_tbspc_get.py | 6 +- .../tablespaces/tests/test_tbspc_put.py | 2 +- .../servers/tablespaces/tests/utils.py | 5 +- .../connect/sql/tests/test_check_recovery.py | 2 +- .../servers/tests/test_server_add.py | 2 +- .../servers/tests/test_server_delete.py | 2 +- .../servers/tests/test_server_get.py | 2 +- .../servers/tests/test_server_put.py | 3 +- .../server_groups/servers/tests/utils.py | 2 +- .../browser/tests/test_change_password.py | 4 +- web/pgadmin/browser/tests/test_login.py | 3 +- web/pgadmin/browser/tests/test_logout.py | 2 +- .../browser/tests/test_reset_password.py | 4 +- .../connect_to_server_feature_test.py | 2 +- .../feature_tests/table_ddl_feature_test.py | 2 +- .../python_test_utils/template_helper.py | 9 + web/regression/runtests.py | 2 +- web/regression/test_utils.py | 455 ------------------ 188 files changed, 921 insertions(+), 1304 deletions(-) delete mode 100644 web/regression/test_utils.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py index fb5396ce7..cf1dc9fcc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_add.py @@ -8,14 +8,15 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from . import utils as cast_utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as cast_utils class CastsAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py index c60efc161..210e49d12 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py @@ -9,12 +9,12 @@ from __future__ import print_function -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict -from . import utils as cast_utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as cast_utils class CastsDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py index 88663575e..814508b59 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py @@ -8,14 +8,13 @@ ########################################################################## from __future__ import print_function -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict -from . import utils as cast_utils + from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -import os -import sys +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as cast_utils class CastsGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py index db7c71899..8a3e7cb0a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py @@ -8,14 +8,15 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict -from . import utils as cast_utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as cast_utils class CastsPutTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py index a9f4a9360..b1875c028 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def get_cast_data(): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py index ca00c9389..233078861 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from regression import test_utils as utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils -from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from regression.python_test_utils import test_utils as utils class EventTriggerAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py index 57164ca47..e8dd4ae8e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py @@ -9,16 +9,16 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from regression import test_utils as utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils +from regression.python_test_utils import test_utils as utils from . import utils as event_trigger_utils -from pgadmin.browser.server_groups.servers.tests import utils as server_utils class EventTriggerDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py index f209d0fec..540dacfbf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py @@ -9,16 +9,16 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from regression import test_utils as utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils +from regression.python_test_utils import test_utils as utils from . import utils as event_trigger_utils -from pgadmin.browser.server_groups.servers.tests import utils as server_utils class EventTriggerGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py index da737fd9b..d232cdbd8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py @@ -7,19 +7,19 @@ # ########################################################################## -import uuid import json +import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from regression import test_utils as utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils +from regression.python_test_utils import test_utils as utils from . import utils as event_trigger_utils -from pgadmin.browser.server_groups.servers.tests import utils as server_utils class EventTriggerPutTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py index 9a1430c90..1e4040d95 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def create_event_trigger(server, db_name, schema_name, func_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py index d2f4de300..c600d9535 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py @@ -8,13 +8,14 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as extension_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py index 179d651f4..6fa19812f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py @@ -9,11 +9,11 @@ from __future__ import print_function -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as extension_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py index 42addde1c..a12b22b5e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py @@ -9,11 +9,11 @@ from __future__ import print_function -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as extension_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py index 363da170d..c47d37f30 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py @@ -8,13 +8,14 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as extension_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py index 9d234db17..1bf121633 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def get_extension_data(schema_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py index a121c2294..e5972a15d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py @@ -8,18 +8,19 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class ForeignServerAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py index a14ff269d..4dd6e2f58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py @@ -8,17 +8,18 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as fsrv_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py index a1907b19e..e2ceb7ed9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py @@ -8,17 +8,18 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests\ import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as fsrv_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py index 1ecbe546e..fa682005a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py @@ -8,18 +8,19 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests\ import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as fsrv_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py index cc1915b55..affeac3e4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py @@ -8,9 +8,11 @@ ########################################################################## from __future__ import print_function + import os import sys -from regression.test_utils import get_db_connection + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py index 170c154c3..96955c657 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py @@ -8,20 +8,21 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests\ - import utils as fdw_utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests\ + import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class UserMappingAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py index d9b5762b2..b4896e441 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py @@ -8,19 +8,20 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ - import utils as fdw_utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ + import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py index 978e63848..50ebba8a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py @@ -8,19 +8,20 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ - import utils as fdw_utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ + import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py index 2faa5aa9f..cf077b417 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py @@ -8,20 +8,21 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ utils as extension_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ - import utils as fdw_utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.tests \ + import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py index 59e792773..ee13329c2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def create_user_mapping(server, db_name, fsrv_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py index f1706cd0f..e760d93d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py @@ -8,16 +8,15 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ - utils as extension_utils -from . import utils as fdw_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils +from . import utils as fdw_utils class FDWDAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py index a14bed3b9..cb758c65e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py @@ -8,16 +8,15 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ - utils as extension_utils -from . import utils as fdw_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils +from . import utils as fdw_utils class FDWDDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py index 9a307fb42..5a1bd93d4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py @@ -9,15 +9,14 @@ from __future__ import print_function -from pgadmin.utils.route import BaseTestGenerator +import uuid + from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ - utils as extension_utils -from . import utils as fdw_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils -import uuid +from regression.python_test_utils import test_utils as utils +from . import utils as fdw_utils class FDWDGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py index 2ddb242c9..bc12d3907 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py @@ -8,17 +8,16 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.browser.server_groups.servers.databases.extensions.tests import \ - utils as extension_utils -from . import utils as fdw_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils +from . import utils as fdw_utils class FDWDPutTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py index 4379f15ee..6f429a787 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py @@ -8,11 +8,12 @@ ########################################################################## from __future__ import print_function + +import sys import traceback import uuid -import sys -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def get_fdw_data(schema_name, db_user): diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py index 87aa81a8b..ecd8e96f6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py @@ -8,14 +8,15 @@ ########################################################################## from __future__ import print_function + import json import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as language_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py index 3cbe4fbe1..cb189bcf0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py @@ -8,13 +8,14 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as language_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py index e55afea5f..c4f3829c2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py @@ -8,13 +8,14 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as language_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py index 941bdc6dc..1df99ea8c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py @@ -8,14 +8,15 @@ ########################################################################## from __future__ import print_function + import json import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as language_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py index de4ee47d8..a1ef6f9f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression.test_utils import get_db_connection +from regression.python_test_utils.test_utils import get_db_connection def create_language(server, db_name, lang_name): 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 2748d3619..5f675c3a9 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 @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class CollationAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py index 81db0c437..3729b8700 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as collation_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py index 5f5b983d5..411cdeb86 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as collation_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py index 359d68ef9..b5f38a586 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as collation_utils 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 684944147..98bab9607 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 @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_collation(server, schema_name, coll_name, db_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py index 0fbc4f876..cb4dbc491 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class DomainAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py index c2ccb8a11..21f9248db 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as domain_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py index 6a93ab5e9..17d215a16 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as domain_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py index 15d7853e7..b71a1e24a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as domain_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py index 6cacff236..83559bf2f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_domain(server, db_name, schema_name, schema_id, domain_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py index 4cc0f1b0a..d11e11c27 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py @@ -8,18 +8,19 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ - tests import utils as fdw_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class ForeignTableAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py index 10ffc31c7..86ea0ae6a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py @@ -8,17 +8,18 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ - tests import utils as fdw_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as ft_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py index 25fbdecb9..7c4faf1c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py @@ -8,17 +8,18 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ - tests import utils as fdw_utils from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as ft_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py index 62eecc5e1..b46e18442 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py @@ -8,18 +8,19 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ - tests import utils as fdw_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ foreign_servers.tests import utils as fsrv_utils +from pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ + tests import utils as fdw_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils from . import utils as ft_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py index 67ecf3e88..df631b6c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py @@ -8,10 +8,12 @@ ########################################################################## from __future__ import print_function + import os import sys import traceback -from regression.test_utils import get_db_connection + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py index 6fcb0bfb1..55a0be8cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py @@ -8,18 +8,19 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas. \ fts_parser.tests import utils as fts_parser_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class FTSConfiguraionAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py index 7d42f1aa8..3ab0d81c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_configuration_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py index 8276eef78..b148db380 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_configuration_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py index 174eb526a..1c66543fa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_configuration_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py index 10d5e7bef..4175b1959 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py @@ -8,10 +8,12 @@ ########################################################################## from __future__ import print_function -import traceback + import os import sys -from regression.test_utils import get_db_connection +import traceback + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py index 468715ff8..bb484ba8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class FtsDictionaryAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py index 3b4706140..a76bea5ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_dict_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py index 2e71f4478..966ece421 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_dict_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py index 208877ddf..ee043206a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_dict_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py index a9d0cd20e..f2a5780a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py @@ -8,10 +8,12 @@ ########################################################################## from __future__ import print_function -import traceback + import os import sys -from regression.test_utils import get_db_connection +import traceback + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_add.py index 1d33f7261..3ae500b26 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_add.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class FtsParserAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete.py index c84b53f92..b65163042 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_parser_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_get.py index 826fc15b0..07c8eea93 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_get.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_parser_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_put.py index 74b8dd076..7eb17b2e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_put.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_parser_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/utils.py index a85fb7d07..728f5519d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/utils.py @@ -8,10 +8,12 @@ ########################################################################## from __future__ import print_function -import traceback + import os import sys -from regression.test_utils import get_db_connection +import traceback + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py index 800e7d266..8683ff258 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class FtsTemplateAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py index c4e618a73..68cb823ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_temp_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py index 4739dc092..cff9696a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py @@ -8,15 +8,16 @@ ########################################################################## from __future__ import print_function + import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_temp_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py index aa96fb5d4..3d314f575 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py @@ -8,16 +8,17 @@ ########################################################################## from __future__ import print_function -import uuid -import json -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict -from regression import test_utils as utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils +import json +import uuid + from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import \ + utils as database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fts_temp_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py index 38ac3ae2c..619fbd601 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py @@ -8,10 +8,12 @@ ########################################################################## from __future__ import print_function -import traceback + import os import sys -from regression.test_utils import get_db_connection +import traceback + +from regression.python_test_utils.test_utils import get_db_connection file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py index bb5a8adf1..dcbf9ffc2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py @@ -7,17 +7,17 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class TriggerFuncAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py index 95b4a2aee..a8bd21605 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py @@ -9,14 +9,14 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as trigger_funcs_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py index dd6d844f4..a5abaa7d1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from . import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as trigger_funcs_utils class TriggerFuncGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py index 2ff28b4a3..a5fbe182c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from . import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as trigger_funcs_utils class TriggerFuncPutTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py index 988219345..74344f1aa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_trigger_function(server, db_name, schema_name, func_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py index fbd3352ea..144e148ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py @@ -7,17 +7,17 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class PackageAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py index e3d9ca62f..1d767e8e7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py @@ -9,14 +9,14 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as package_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py index 5862eb12d..87e7d9afa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py @@ -9,14 +9,14 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as package_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py index 2c5bbcc47..2c960e274 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py @@ -7,17 +7,17 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as package_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py index 1e2070ad0..24187d6f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_package(server, db_name, schema_name, pkg_name, proc_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py index 1d9737ba7..583b51452 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py @@ -10,13 +10,13 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class SequenceAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py index 0f87b6663..a6f6f413d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as sequence_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py index 9c38186e0..56afcc24b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as sequence_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py index 8efbd7ae9..e7c33446f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py @@ -7,18 +7,17 @@ # ########################################################################## +import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as sequence_utils -import json class SequencePutTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py index 958c002ac..d114d50a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_sequences(server, db_name, schema_name, sequence_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py index bfe3d1374..53c3fca73 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py @@ -7,19 +7,19 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ import utils as sequence_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class SynonymAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py index 6ba8d2045..cb6d69b21 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py @@ -9,16 +9,16 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ import utils as sequence_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as synonym_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py index 640d5ac62..4fdbd061b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py @@ -9,16 +9,16 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ import utils as sequence_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as synonym_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py index badbbd81b..0391add05 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py @@ -7,21 +7,21 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ - import utils as sequence_utils from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as functions_utils +from pgadmin.browser.server_groups.servers.databases.schemas.sequences.tests \ + import utils as sequence_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as synonym_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py index 99a9d5f46..f49669a19 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_synonym(server, db_name, schema_name, synonym_name, sequence_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_add.py index 8d42a7989..6fc8b0501 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class ColumnAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete.py index d7cc69673..d558cee49 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as columns_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_get.py index 0cc88e8d0..713d9992b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as columns_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_put.py index f94b8ac51..656cb83e7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as columns_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/utils.py index 830dd4b66..103ee784a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_column(server, db_name, schema_name, table_name, col_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py index 1a79bc5a4..1e28d51c4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class CheckConstraintAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py index 03f37ae23..0dd361dc5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as chk_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py index 3a16e4c8f..ee94bbc46 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as chk_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py index 3c4b673e6..6192ae5a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/test_check_constraint_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as chk_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py index ae0c89218..9eb96173e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_check_constraint(server, db_name, schema_name, table_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py index 14ccc53ac..dfd4e63ad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class ForeignKeyAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py index 9b8a468b1..166d6b163 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fk_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py index e9024613a..55b4929b0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fk_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py index 375ff279d..1668fdbb8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/test_foreign_key_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as fk_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py index 5e71c911a..6ee494707 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_foreignkey(server, db_name, schema_name, local_table_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py index c33b14a1f..7e8a90180 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class IndexConstraintAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py index f5bccb443..c9492d086 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as index_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py index 576bf66d0..be126f643 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as index_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py index 72d44e375..c9e1be85c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/test_index_constraint_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as index_constraint_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py index 3f091c49f..af3cf0c15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_index_constraint(server, db_name, schema_name, table_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py index ea282606f..4a03a1a5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class IndexesAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py index 45d5588e0..a00ce818f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_delete.py @@ -9,17 +9,17 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.column. \ tests import utils as columns_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as indexes_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py index ac138e54e..a3d3c3bca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_get.py @@ -9,17 +9,17 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.column. \ tests import utils as columns_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as indexes_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py index 963e8beea..148f85657 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/test_indexes_put.py @@ -7,20 +7,20 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.column. \ tests import utils as columns_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as indexes_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py index 78f81c2b8..138606826 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_index(server, db_name, schema_name, table_name, index_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py index 995e3ac2b..dd8a4cb15 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py @@ -10,15 +10,15 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class RulesAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py index 8a0362442..b0c99dd31 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as rules_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py index bbf5f97c5..b349878ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as rules_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py index 740e82586..a04258098 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as rules_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py index b7b213b9e..611c6b3a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_rule(server, db_name, schema_name, table_name, rule_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_acl.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_acl.py index 685c11061..7be945c70 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_acl.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_acl.py @@ -6,7 +6,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_properties.py index 49f5175f4..b1984bdad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/tests/test_column_properties.py @@ -15,7 +15,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py index 18517faa6..faef8d23e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py @@ -15,7 +15,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_acl.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_acl.py index 4eb0e021e..60b4c8ac0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_acl.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_acl.py @@ -15,7 +15,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_node.py index bf54a3907..20a645a34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_node.py @@ -14,7 +14,7 @@ from jinja2 import BaseLoader from jinja2 import Environment from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_properties.py index 2c7cd5bfc..a553bd9bf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/tests/test_tables_properties.py @@ -15,7 +15,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_get_oid.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_get_oid.py index 6808d4529..f2b637ee3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_get_oid.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_get_oid.py @@ -17,7 +17,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_nodes.py index 208cf0034..b23bf60a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/tests/test_trigger_nodes.py @@ -15,7 +15,7 @@ from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: long = int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py index ce2be9fa8..0703cba3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py @@ -10,16 +10,13 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from pgadmin.browser.server_groups.servers.tablespaces.tests import utils as \ - tablespace_utils -from . import utils as table_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class TableAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py index a488b9aba..1b2f9f55a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tables_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py index 4a1d9d9d5..2a1d96955 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tables_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py index 3f2ca75d3..bfbf884f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tables_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py index 05bbced67..456f0202e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_table(server, db_name, schema_name, table_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py index b1659eec2..f2398aa8e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py @@ -10,17 +10,17 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class TriggersAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py index 121c0f1dc..1ea4bde6e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py @@ -9,17 +9,17 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py index 8ea0bfa9a..58dd92936 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py @@ -9,17 +9,17 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py index 822fc5cd4..7166c1fe8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py @@ -7,20 +7,20 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ - utils as schema_utils -from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ - import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ + import utils as tables_utils +from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ + utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py index f4e1e3e09..b5b042eaa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_trigger(server, db_name, schema_name, table_name, trigger_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py index 7e47ae5ce..9a98dcc10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py @@ -10,11 +10,11 @@ import json import uuid -from regression import test_utils as utils -from pgadmin.utils.route import BaseTestGenerator -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class SchemaAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py index d6bc7fb9e..cfedec589 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py @@ -9,11 +9,11 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as schema_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py index 03963eac4..d39692be0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py @@ -7,12 +7,12 @@ # ########################################################################## -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.tests import utils as server_utils from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils +from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class SchemaGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py index fbb760dc5..8835c5251 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py @@ -10,11 +10,11 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as schema_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py index def86c2bd..fca2add96 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py @@ -8,11 +8,12 @@ ########################################################################## from __future__ import print_function -import sys -import uuid -import traceback -from regression import test_utils as utils +import sys +import traceback +import uuid + +from regression.python_test_utils import test_utils as utils def get_schema_config_data(db_user): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py index a67113049..a1d98d092 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py @@ -10,13 +10,13 @@ import json import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class TypesAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py index d10a64e38..8f18b8e40 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as types_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py index a15f839bf..3fe57af17 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py @@ -9,13 +9,13 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as types_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py index 47c6b5851..6a7017b39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py @@ -7,16 +7,16 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as types_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py index 39895c42e..8c57339b4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_type(server, db_name, schema_name, type_name): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py index 8f7df85dc..1cc23fa6c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py @@ -6,17 +6,17 @@ # This software is released under the PostgreSQL Licence # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class ViewsAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py index ea5dd0ef4..4a41e586f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from . import utils as views_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as views_utils class ViewsDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py index f3a01fd7d..9d2cacef3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py @@ -9,15 +9,15 @@ import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from . import utils as views_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as views_utils class ViewsGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py index 77cd3ab75..05c185122 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py @@ -7,18 +7,18 @@ # ########################################################################## -import uuid import json +import uuid -from regression import test_utils as utils -from regression import parent_node_dict -from pgadmin.utils.route import BaseTestGenerator -from pgadmin.browser.server_groups.servers.databases.tests import utils as \ - database_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ utils as schema_utils -from . import utils as views_utils +from pgadmin.browser.server_groups.servers.databases.tests import utils as \ + database_utils from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils +from . import utils as views_utils class ViewsUpdateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py index 757e6a2d2..11e8f73a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function -import traceback -import sys -from regression import test_utils as utils +import sys +import traceback + +from regression.python_test_utils import test_utils as utils def create_view(server, db_name, schema_name, sql_query, view_name): 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 2c2c4e164..10aab87d2 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 @@ -9,10 +9,10 @@ import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py index 407eb8bf6..e9f3946f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py @@ -9,10 +9,10 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class DatabaseDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py index 57fdd693e..ee187c2ad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py @@ -8,8 +8,8 @@ ########################################################################## from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py index 84ffad3ec..6bd36e609 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py @@ -11,8 +11,8 @@ import json import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as database_utils 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 484d3e6b7..05ced56e4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/utils.py @@ -11,7 +11,7 @@ import json import uuid from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils DATABASE_CONNECT_URL = '/browser/database/connect/' diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py index c4b1b41e6..ab69f0dc4 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py @@ -7,13 +7,13 @@ # ########################################################################## -import uuid import json +import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py index 8d018e70c..3ce9b793a 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py @@ -9,10 +9,10 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py index 559c826c9..51a80f839 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py @@ -7,13 +7,13 @@ # ########################################################################## -import uuid import json +import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py index 661474cd5..1cae34ee1 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py @@ -9,10 +9,10 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py index 7f13054e0..82ff963e5 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py @@ -8,10 +8,11 @@ ########################################################################## from __future__ import print_function + import sys import traceback -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils def create_resource_groups(server, resource_group_name): diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py index 4678f1494..03cbd46c0 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py @@ -9,10 +9,10 @@ import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py index 70584e164..6084b8fc4 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py @@ -10,8 +10,8 @@ import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py index eb8137683..2a816bbf1 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py @@ -10,8 +10,8 @@ import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py index c136ed0e6..0b7aa5a9d 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py @@ -11,8 +11,8 @@ import json import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py index fad1a3455..24d287990 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py @@ -9,16 +9,13 @@ from __future__ import print_function -import json import os import pickle -import uuid import sys +import uuid +from regression.python_test_utils import test_utils as utils from regression.test_setup import config_data -from pgadmin.browser.server_groups.servers.tests import utils as server_utils -from regression import test_utils as utils - ROLE_URL = '/browser/role/obj/' file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py index 775ff180a..b5a1b838e 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py @@ -8,12 +8,13 @@ ########################################################################## from __future__ import print_function + import json -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py index 1b6ccd47a..16a37d80d 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py @@ -8,12 +8,13 @@ ########################################################################## from __future__ import print_function -import uuid + import json +import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py index 92fb00799..11bd61686 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py @@ -9,10 +9,10 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils -from regression import parent_node_dict from pgadmin.browser.server_groups.servers.tests import utils as server_utils +from pgadmin.utils.route import BaseTestGenerator +from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py index 2662d796f..59263429b 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py @@ -11,8 +11,8 @@ import json import uuid from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py index d44129cca..865531e28 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py @@ -10,11 +10,10 @@ from __future__ import print_function import os -import uuid import sys +import uuid - -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils TABLE_SPACE_URL = '/browser/tablespace/obj/' file_name = os.path.basename(__file__) diff --git a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/tests/test_check_recovery.py b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/tests/test_check_recovery.py index 47c7b4873..90b2e520e 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/tests/test_check_recovery.py +++ b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/tests/test_check_recovery.py @@ -1,7 +1,7 @@ import os from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils +from regression.python_test_utils import test_utils class TestCheckRecovery(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py index 18c171e7f..ee80dc4fb 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py @@ -10,7 +10,7 @@ import json from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class ServersAddTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py index 7de995c9d..9b622c6d4 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py @@ -8,7 +8,7 @@ ########################################################################## from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class ServerDeleteTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py index be939ca55..a91c6e4df 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py @@ -8,8 +8,8 @@ ########################################################################## from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils from regression import parent_node_dict +from regression.python_test_utils import test_utils as utils class ServersGetTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py index 25679bd31..e3b1c2861 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py @@ -8,8 +8,9 @@ ########################################################################## import json + from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class ServerUpdateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tests/utils.py index b906a9ef0..f510ba4c4 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/tests/utils.py @@ -11,7 +11,7 @@ from __future__ import print_function import json -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils SERVER_URL = '/browser/server/obj/' SERVER_CONNECT_URL = '/browser/server/connect/' diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index b0258f42a..ddeb9f36d 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -7,12 +7,12 @@ # ########################################################################## -import uuid import json +import uuid from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils import test_utils from regression.test_setup import config_data -from regression import test_utils from . import utils diff --git a/web/pgadmin/browser/tests/test_login.py b/web/pgadmin/browser/tests/test_login.py index 4467bb885..f9b8e7c85 100644 --- a/web/pgadmin/browser/tests/test_login.py +++ b/web/pgadmin/browser/tests/test_login.py @@ -8,9 +8,10 @@ ########################################################################## import uuid + from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils import test_utils as utils from regression.test_setup import config_data -from regression import test_utils as utils class LoginTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/tests/test_logout.py b/web/pgadmin/browser/tests/test_logout.py index 35c1fad3a..914a0733c 100644 --- a/web/pgadmin/browser/tests/test_logout.py +++ b/web/pgadmin/browser/tests/test_logout.py @@ -9,7 +9,7 @@ from pgadmin.utils.route import BaseTestGenerator -from regression import test_utils as utils +from regression.python_test_utils import test_utils as utils class LogoutTest(BaseTestGenerator): diff --git a/web/pgadmin/browser/tests/test_reset_password.py b/web/pgadmin/browser/tests/test_reset_password.py index dfa740827..18ee08653 100644 --- a/web/pgadmin/browser/tests/test_reset_password.py +++ b/web/pgadmin/browser/tests/test_reset_password.py @@ -10,9 +10,9 @@ import uuid from pgadmin.utils.route import BaseTestGenerator +from regression.python_test_utils.test_utils import login_tester_account +from regression.python_test_utils.test_utils import logout_tester_account from regression.test_setup import config_data -from regression.test_utils import login_tester_account -from regression.test_utils import logout_tester_account class ResetPasswordTestCase(BaseTestGenerator): diff --git a/web/pgadmin/feature_tests/connect_to_server_feature_test.py b/web/pgadmin/feature_tests/connect_to_server_feature_test.py index 937da2da6..97cd6afab 100644 --- a/web/pgadmin/feature_tests/connect_to_server_feature_test.py +++ b/web/pgadmin/feature_tests/connect_to_server_feature_test.py @@ -10,8 +10,8 @@ from selenium.webdriver import ActionChains import config as app_config -from regression import test_utils from regression.feature_utils.base_feature_test import BaseFeatureTest +from regression.python_test_utils import test_utils class ConnectsToServerFeatureTest(BaseFeatureTest): diff --git a/web/pgadmin/feature_tests/table_ddl_feature_test.py b/web/pgadmin/feature_tests/table_ddl_feature_test.py index 2f364437f..7f306d389 100644 --- a/web/pgadmin/feature_tests/table_ddl_feature_test.py +++ b/web/pgadmin/feature_tests/table_ddl_feature_test.py @@ -7,8 +7,8 @@ # ########################################################################## -from regression import test_utils from regression.feature_utils.base_feature_test import BaseFeatureTest +from regression.python_test_utils import test_utils class TableDdlFeatureTest(BaseFeatureTest): diff --git a/web/regression/python_test_utils/template_helper.py b/web/regression/python_test_utils/template_helper.py index a6d350c7f..28610a150 100644 --- a/web/regression/python_test_utils/template_helper.py +++ b/web/regression/python_test_utils/template_helper.py @@ -1,3 +1,12 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2017, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## + from jinja2 import BaseLoader from jinja2 import Environment diff --git a/web/regression/runtests.py b/web/regression/runtests.py index c225208f6..289c2f9ae 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -79,7 +79,7 @@ exec (open("setup.py").read()) from pgadmin.model import SCHEMA_VERSION # Delay the import test_utils as it needs updated config.SQLITE_PATH -from regression import test_utils +from regression.python_test_utils import test_utils config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION diff --git a/web/regression/test_utils.py b/web/regression/test_utils.py deleted file mode 100644 index 85c44b44d..000000000 --- a/web/regression/test_utils.py +++ /dev/null @@ -1,455 +0,0 @@ -########################################################################## -# -# pgAdmin 4 - PostgreSQL Tools -# -# Copyright (C) 2013 - 2017, The pgAdmin Development Team -# This software is released under the PostgreSQL Licence -# -########################################################################## - -from __future__ import print_function -import traceback -import os -import sys -import uuid -import psycopg2 -import sqlite3 -from functools import partial - -import config -import regression -from regression import test_setup - -SERVER_GROUP = test_setup.config_data['server_group'] -file_name = os.path.realpath(__file__) - - -def get_db_connection(db, username, password, host, port): - """This function returns the connection object of psycopg""" - connection = psycopg2.connect(database=db, - user=username, - password=password, - host=host, - port=port) - return connection - - -def login_tester_account(tester): - """ - This function login the test client using env variables email and password - :param tester: test client - :type tester: flask test client object - :return: None - """ - if os.environ['PGADMIN_SETUP_EMAIL'] and \ - os.environ['PGADMIN_SETUP_PASSWORD']: - email = os.environ['PGADMIN_SETUP_EMAIL'] - password = os.environ['PGADMIN_SETUP_PASSWORD'] - tester.post('/login', data=dict(email=email, password=password), - follow_redirects=True) - else: - print("Unable to login test client, email and password not found.", - file=sys.stderr) - _drop_objects(tester) - sys.exit(1) - - -def logout_tester_account(tester): - """ - This function logout the test account - - :param tester: test client - :type tester: flask test client object - :return: None - """ - - response = tester.get('/logout') - - -def get_config_data(): - """This function reads the server data from config_data""" - server_data = [] - for srv in test_setup.config_data['server_credentials']: - if (not 'enabled' in srv) or srv['enabled']: - data = {"name": srv['name'], - "comment": srv['comment'], - "host": srv['host'], - "port": srv['db_port'], - "db": srv['maintenance_db'], - "username": srv['db_username'], - "db_password": srv['db_password'], - "role": "", - "sslmode": srv['sslmode'], - "tablespace_path": srv.get('tablespace_path', None)} - server_data.append(data) - return server_data - - -def write_node_info(key, node_info=None): - """ - This function append the node details to - :param key: dict key name to store node info - :type key: str - :param node_info: node details - :type node_info: dict - :return: node_info_dict - :rtype: dict - """ - node_info_dict = regression.node_info_dict - if node_info not in node_info_dict[key]: - node_info_dict[key].append(node_info) - - -def clear_node_info_dict(): - """This function used to clears the node_info_dict variable""" - node_info_dict = regression.node_info_dict - for node in node_info_dict: - del node_info_dict[node][:] - - -def create_database(server, db_name): - """This function used to create database and returns the database id""" - try: - connection = get_db_connection(server['db'], - server['username'], - server['db_password'], - server['host'], - server['port']) - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) - pg_cursor = connection.cursor() - pg_cursor.execute('''CREATE DATABASE "%s" TEMPLATE template0''' % db_name) - connection.set_isolation_level(old_isolation_level) - connection.commit() - - # Get 'oid' from newly created database - pg_cursor.execute("SELECT db.oid from pg_database db WHERE" - " db.datname='%s'" % db_name) - oid = pg_cursor.fetchone() - db_id = '' - if oid: - db_id = oid[0] - connection.close() - return db_id - except Exception: - traceback.print_exc(file=sys.stderr) - - -def create_table(server, db_name, table_name): - try: - connection = get_db_connection(db_name, - server['username'], - server['db_password'], - server['host'], - server['port']) - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) - pg_cursor = connection.cursor() - pg_cursor.execute('''CREATE TABLE "%s" (some_column VARCHAR, value NUMERIC)''' % table_name) - pg_cursor.execute('''INSERT INTO "%s" VALUES ('Some-Name', 6)''' % table_name) - connection.set_isolation_level(old_isolation_level) - connection.commit() - - except Exception: - traceback.print_exc(file=sys.stderr) - - -def create_table(server, db_name, table_name): - try: - connection = get_db_connection(db_name, - server['username'], - server['db_password'], - server['host'], - server['port']) - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) - pg_cursor = connection.cursor() - pg_cursor.execute('''CREATE TABLE "%s" (some_column VARCHAR, value NUMERIC)''' % table_name) - pg_cursor.execute('''INSERT INTO "%s" VALUES ('Some-Name', 6)''' % table_name) - connection.set_isolation_level(old_isolation_level) - connection.commit() - - except Exception: - traceback.print_exc(file=sys.stderr) - - -def drop_database(connection, database_name): - """This function used to drop the database""" - if database_name not in ["postgres", "template1", "template0"]: - pg_cursor = connection.cursor() - if connection.server_version >= 90100: - pg_cursor.execute( - "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity " - "WHERE pg_stat_activity.datname ='%s' AND pid <> pg_backend_pid();" % database_name - ) - else: - pg_cursor.execute( - "SELECT pg_cancel_backend(procpid) FROM pg_stat_activity " \ - "WHERE pg_stat_activity.datname ='%s' AND current_query='';" % database_name - ) - pg_cursor.execute("SELECT * FROM pg_database db WHERE" - " db.datname='%s'" % database_name) - if pg_cursor.fetchall(): - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) - pg_cursor.execute('''DROP DATABASE "%s"''' % database_name) - connection.set_isolation_level(old_isolation_level) - connection.commit() - connection.close() - - -def drop_tablespace(connection): - """This function used to drop the tablespace""" - pg_cursor = connection.cursor() - pg_cursor.execute("SELECT * FROM pg_tablespace") - table_spaces = pg_cursor.fetchall() - if table_spaces: - for table_space in table_spaces: - if table_space[0] not in ["pg_default", "pg_global"]: - old_isolation_level = connection.isolation_level - connection.set_isolation_level(0) - pg_cursor.execute("DROP TABLESPACE %s" % table_space[0]) - connection.set_isolation_level(old_isolation_level) - connection.commit() - connection.close() - - -def create_server(server): - """This function is used to create server""" - try: - conn = sqlite3.connect(config.TEST_SQLITE_PATH) - # Create the server - cur = conn.cursor() - server_details = (1, SERVER_GROUP, server['name'], server['host'], - server['port'], server['db'], server['username'], - server['role'], server['sslmode'], server['comment']) - cur.execute('INSERT INTO server (user_id, servergroup_id, name, host, ' - 'port, maintenance_db, username, role, ssl_mode,' - ' comment) VALUES (?,?,?,?,?,?,?,?,?,?)', server_details) - server_id = cur.lastrowid - conn.commit() - # Add server info to parent_node_dict - regression.parent_node_dict["server"].append({"server_id": server_id, - "server": server}) - - return server_id - except Exception as exception: - raise Exception("Error while creating server. %s" % exception) - - -def delete_server_with_api(tester, sid): - """This function used to delete server from SQLite""" - try: - url = '/browser/server/obj/' + str(SERVER_GROUP) + "/" - # Call API to delete the server - response = tester.delete(url + str(sid)) - except Exception: - traceback.print_exc(file=sys.stderr) - - -def add_db_to_parent_node_dict(srv_id, db_id, test_db_name): - regression.parent_node_dict["database"].append({"server_id": srv_id, - "db_id": db_id, - "db_name": test_db_name}) - - -def add_schema_to_parent_node_dict(srv_id, db_id, schema_id, schema_name): - regression.parent_node_dict["schema"].append({"server_id": srv_id, - "db_id": db_id, - "schema_id": schema_id, - "schema_name": schema_name}) - - -def create_parent_server_node(server_info): - """ - This function create the test server which will act as parent server, - the other node will add under this server - :param server_info: server details - :type server_info: dict - :return: None - """ - srv_id = create_server(server_info) - # Create database - test_db_name = "test_db_%s" % str(uuid.uuid4())[1:6] - db_id = create_database(server_info, test_db_name) - add_db_to_parent_node_dict(srv_id, db_id, test_db_name) - # Create schema - schema_name = "test_schema_%s" % str(uuid.uuid4())[1:6] - connection = get_db_connection(test_db_name, - server_info['username'], - server_info['db_password'], - server_info['host'], - server_info['port']) - - schema = regression.schema_utils.create_schema(connection, schema_name) - add_schema_to_parent_node_dict(srv_id, db_id, schema[0], - schema[1]) - - -def delete_test_server(tester): - try: - parent_node_dict = regression.parent_node_dict - test_servers = parent_node_dict["server"] - test_databases = parent_node_dict["database"] - test_roles = regression.node_info_dict["lrid"] - test_table_spaces = regression.node_info_dict["tsid"] - for test_server in test_servers: - srv_id = test_server["server_id"] - servers_dict = test_server["server"] - for database in test_databases: - connection = get_db_connection(servers_dict['db'], - servers_dict['username'], - servers_dict['db_password'], - servers_dict['host'], - servers_dict['port']) - database_name = database["db_name"] - # Drop database - drop_database(connection, database_name) - for role in test_roles: - connection = get_db_connection(servers_dict['db'], - servers_dict['username'], - servers_dict['db_password'], - servers_dict['host'], - servers_dict['port']) - # Delete role - regression.roles_utils.delete_role(connection, - role["role_name"]) - for tablespace in test_table_spaces: - connection = get_db_connection(servers_dict['db'], - servers_dict['username'], - servers_dict['db_password'], - servers_dict['host'], - servers_dict['port']) - # Delete tablespace - regression.tablespace_utils.delete_tablespace( - connection, tablespace["tablespace_name"]) - # Delete server - delete_server_with_api(tester, srv_id) - except Exception: - traceback.print_exc(file=sys.stderr) - raise - - -def get_db_password(config_servers, name, host, db_port): - db_password = '' - for srv in config_servers: - if (srv['name'], srv['host'], srv['db_port']) == (name, host, db_port): - db_password = srv['db_password'] - return db_password - - -def get_db_server(sid): - connection = '' - conn = sqlite3.connect(config.TEST_SQLITE_PATH) - cur = conn.cursor() - server = cur.execute('SELECT name, host, port, maintenance_db,' - ' username FROM server where id=%s' % sid) - server = server.fetchone() - if server: - name = server[0] - host = server[1] - db_port = server[2] - db_name = server[3] - username = server[4] - config_servers = test_setup.config_data['server_credentials'] - # Get the db password from config file for appropriate server - db_password = get_db_password(config_servers, name, host, db_port) - if db_password: - # Drop database - connection = get_db_connection(db_name, - username, - db_password, - host, - db_port) - conn.close() - return connection - - -def remove_db_file(): - """This function use to remove SQLite DB file""" - if os.path.isfile(config.TEST_SQLITE_PATH): - os.remove(config.TEST_SQLITE_PATH) - - -def _cleanup(tester, app_starter): - """This function use to cleanup the created the objects(servers, databases, - schemas etc) during the test suite run""" - try: - test_servers = regression.parent_node_dict["server"] + \ - regression.node_info_dict["sid"] - test_databases = regression.parent_node_dict["database"] + \ - regression.node_info_dict["did"] - test_table_spaces = regression.parent_node_dict["tablespace"] + \ - regression.node_info_dict["tsid"] - test_roles = regression.parent_node_dict["role"] + \ - regression.node_info_dict["lrid"] - # Drop databases - for database in test_databases: - connection = get_db_server(database["server_id"]) - if connection: - drop_database(connection, database["db_name"]) - # Delete table spaces - for tablespace in test_table_spaces: - connection = get_db_server(tablespace["server_id"]) - if connection: - regression.tablespace_utils.delete_tablespace( - connection, tablespace["tablespace_name"]) - # Delete roles - for role in test_roles: - connection = get_db_server(role["server_id"]) - if connection: - regression.roles_utils.delete_role(connection, - role["role_name"]) - # Delete servers - for server in test_servers: - delete_server_with_api(tester, server["server_id"]) - except Exception: - traceback.print_exc(file=sys.stderr) - finally: - # Logout the test client - logout_tester_account(tester) - # Remove SQLite db file - remove_db_file() - if app_starter: - app_starter.stop_app() - - -def get_cleanup_handler(tester, app_starter): - """This function use to bind variable to drop_objects function""" - return partial(_cleanup, tester, app_starter) - - -class Database: - """ - Temporarily create and connect to a database, tear it down at exit - - example: - - with Database(server, 'some_test_db') as (connection, database_name): - connection.cursor().execute(...) - - """ - def __init__(self, server): - self.name = None - self.server = server - self.maintenance_connection = None - self.connection = None - - def __enter__(self): - self.name = "test_db_{0}".format(str(uuid.uuid4())[0:7]) - self.maintenance_connection = get_db_connection(self.server['db'], - self.server['username'], - self.server['db_password'], - self.server['host'], - self.server['port']) - create_database(self.server, self.name) - self.connection = get_db_connection(self.name, - self.server['username'], - self.server['db_password'], - self.server['host'], - self.server['port']) - return self.connection, self.name - - def __exit__(self, type, value, traceback): - self.connection.close() - drop_database(self.maintenance_connection, self.name)