From 7bd121078a55bad0d839f54f7e1e7d45029b105b Mon Sep 17 00:00:00 2001 From: Tira Odhner Date: Wed, 22 Mar 2017 17:57:21 -0400 Subject: [PATCH] Move test_utils.py into python_test_utils/ --- .../servers/databases/casts/tests/test_cast_add.py | 7 ++++--- .../databases/casts/tests/test_cast_delete.py | 6 +++--- .../servers/databases/casts/tests/test_cast_get.py | 9 ++++----- .../servers/databases/casts/tests/test_cast_put.py | 7 ++++--- .../servers/databases/casts/tests/utils.py | 3 ++- .../event_triggers/tests/test_event_trigger_add.py | 12 ++++++------ .../tests/test_event_trigger_delete.py | 10 +++++----- .../event_triggers/tests/test_event_trigger_get.py | 10 +++++----- .../event_triggers/tests/test_event_trigger_put.py | 12 ++++++------ .../servers/databases/event_triggers/tests/utils.py | 3 ++- .../databases/extensions/tests/test_extension_add.py | 7 ++++--- .../extensions/tests/test_extension_delete.py | 6 +++--- .../databases/extensions/tests/test_extension_get.py | 6 +++--- .../databases/extensions/tests/test_extension_put.py | 7 ++++--- .../servers/databases/extensions/tests/utils.py | 3 ++- .../tests/test_foreign_servers_add.py | 11 ++++++----- .../tests/test_foreign_servers_delete.py | 9 +++++---- .../tests/test_foreign_servers_get.py | 9 +++++---- .../tests/test_foreign_servers_put.py | 11 ++++++----- .../foreign_servers/tests/utils.py | 4 +++- .../user_mapping/tests/test_user_mapping_add.py | 15 ++++++++------- .../user_mapping/tests/test_user_mapping_delete.py | 13 +++++++------ .../user_mapping/tests/test_user_mapping_get.py | 13 +++++++------ .../user_mapping/tests/test_user_mapping_put.py | 15 ++++++++------- .../foreign_servers/user_mapping/tests/utils.py | 3 ++- .../foreign_data_wrappers/tests/test_fdw_add.py | 9 ++++----- .../foreign_data_wrappers/tests/test_fdw_delete.py | 9 ++++----- .../foreign_data_wrappers/tests/test_fdw_get.py | 11 +++++------ .../foreign_data_wrappers/tests/test_fdw_put.py | 11 +++++------ .../databases/foreign_data_wrappers/tests/utils.py | 5 +++-- .../databases/languages/tests/test_language_add.py | 7 ++++--- .../languages/tests/test_language_delete.py | 7 ++++--- .../databases/languages/tests/test_language_get.py | 7 ++++--- .../databases/languages/tests/test_language_put.py | 7 ++++--- .../servers/databases/languages/tests/utils.py | 3 ++- .../schemas/collations/tests/test_collation_add.py | 12 ++++++------ .../collations/tests/test_collation_delete.py | 10 +++++----- .../schemas/collations/tests/test_collation_get.py | 10 +++++----- .../schemas/collations/tests/test_collation_put.py | 12 ++++++------ .../databases/schemas/collations/tests/utils.py | 5 +++-- .../schemas/domains/tests/test_domain_add.py | 12 ++++++------ .../schemas/domains/tests/test_domain_delete.py | 10 +++++----- .../schemas/domains/tests/test_domain_get.py | 10 +++++----- .../schemas/domains/tests/test_domain_put.py | 12 ++++++------ .../servers/databases/schemas/domains/tests/utils.py | 5 +++-- .../foreign_tables/tests/test_foreign_table_add.py | 15 ++++++++------- .../tests/test_foreign_table_delete.py | 13 +++++++------ .../foreign_tables/tests/test_foreign_table_get.py | 13 +++++++------ .../foreign_tables/tests/test_foreign_table_put.py | 15 ++++++++------- .../databases/schemas/foreign_tables/tests/utils.py | 4 +++- .../tests/test_fts_configuration_add.py | 17 +++++++++-------- .../tests/test_fts_configuration_delete.py | 11 ++++++----- .../tests/test_fts_configuration_get.py | 11 ++++++----- .../tests/test_fts_configuration_put.py | 13 +++++++------ .../schemas/fts_configurations/tests/utils.py | 6 ++++-- .../tests/test_fts_dictionaries_add.py | 13 +++++++------ .../tests/test_fts_dictionaries_delete.py | 11 ++++++----- .../tests/test_fts_dictionaries_get.py | 11 ++++++----- .../tests/test_fts_dictionaries_put.py | 13 +++++++------ .../schemas/fts_dictionaries/tests/utils.py | 6 ++++-- .../schemas/fts_parser/tests/test_fts_parser_add.py | 13 +++++++------ .../fts_parser/tests/test_fts_parser_delete.py | 11 ++++++----- .../schemas/fts_parser/tests/test_fts_parser_get.py | 11 ++++++----- .../schemas/fts_parser/tests/test_fts_parser_put.py | 13 +++++++------ .../databases/schemas/fts_parser/tests/utils.py | 6 ++++-- .../fts_templates/tests/test_fts_templates_add.py | 13 +++++++------ .../fts_templates/tests/test_fts_templates_delete.py | 11 ++++++----- .../fts_templates/tests/test_fts_templates_get.py | 11 ++++++----- .../fts_templates/tests/test_fts_templates_put.py | 13 +++++++------ .../databases/schemas/fts_templates/tests/utils.py | 6 ++++-- .../schemas/functions/tests/test_trigger_func_add.py | 12 ++++++------ .../functions/tests/test_trigger_func_delete.py | 12 ++++++------ .../schemas/functions/tests/test_trigger_func_get.py | 12 ++++++------ .../schemas/functions/tests/test_trigger_func_put.py | 14 +++++++------- .../databases/schemas/functions/tests/utils.py | 5 +++-- .../schemas/packages/tests/test_package_add.py | 14 +++++++------- .../schemas/packages/tests/test_package_delete.py | 12 ++++++------ .../schemas/packages/tests/test_package_get.py | 12 ++++++------ .../schemas/packages/tests/test_package_put.py | 14 +++++++------- .../databases/schemas/packages/tests/utils.py | 5 +++-- .../schemas/sequences/tests/test_sequence_add.py | 10 +++++----- .../schemas/sequences/tests/test_sequence_delete.py | 10 +++++----- .../schemas/sequences/tests/test_sequence_get.py | 10 +++++----- .../schemas/sequences/tests/test_sequence_put.py | 13 ++++++------- .../databases/schemas/sequences/tests/utils.py | 5 +++-- .../schemas/synonyms/tests/test_synonym_add.py | 14 +++++++------- .../schemas/synonyms/tests/test_synonym_delete.py | 12 ++++++------ .../schemas/synonyms/tests/test_synonym_get.py | 12 ++++++------ .../schemas/synonyms/tests/test_synonym_put.py | 18 +++++++++--------- .../databases/schemas/synonyms/tests/utils.py | 5 +++-- .../schemas/tables/column/tests/test_column_add.py | 14 +++++++------- .../tables/column/tests/test_column_delete.py | 14 +++++++------- .../schemas/tables/column/tests/test_column_get.py | 14 +++++++------- .../schemas/tables/column/tests/test_column_put.py | 16 ++++++++-------- .../databases/schemas/tables/column/tests/utils.py | 5 +++-- .../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 ++++++++-------- .../constraints/check_constraint/tests/utils.py | 5 +++-- .../foreign_key/tests/test_foreign_key_add.py | 14 +++++++------- .../foreign_key/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 ++++++++-------- .../tables/constraints/foreign_key/tests/utils.py | 5 +++-- .../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 ++++++++-------- .../constraints/index_constraint/tests/utils.py | 5 +++-- .../schemas/tables/indexes/tests/test_indexes_add.py | 14 +++++++------- .../tables/indexes/tests/test_indexes_delete.py | 18 +++++++++--------- .../schemas/tables/indexes/tests/test_indexes_get.py | 18 +++++++++--------- .../schemas/tables/indexes/tests/test_indexes_put.py | 20 ++++++++++---------- .../databases/schemas/tables/indexes/tests/utils.py | 5 +++-- .../schemas/tables/rules/tests/test_rules_add.py | 14 +++++++------- .../schemas/tables/rules/tests/test_rules_delete.py | 14 +++++++------- .../schemas/tables/rules/tests/test_rules_get.py | 14 +++++++------- .../schemas/tables/rules/tests/test_rules_put.py | 16 ++++++++-------- .../databases/schemas/tables/rules/tests/utils.py | 5 +++-- .../templates/column/sql/tests/test_column_acl.py | 2 +- .../column/sql/tests/test_column_properties.py | 2 +- .../sql/tests/test_foreign_key_properties.py | 2 +- .../templates/table/sql/tests/test_tables_acl.py | 2 +- .../templates/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 +- .../databases/schemas/tables/tests/test_table_add.py | 13 +++++-------- .../schemas/tables/tests/test_table_delete.py | 10 +++++----- .../databases/schemas/tables/tests/test_table_get.py | 10 +++++----- .../databases/schemas/tables/tests/test_table_put.py | 12 ++++++------ .../servers/databases/schemas/tables/tests/utils.py | 5 +++-- .../tables/triggers/tests/test_triggers_add.py | 18 +++++++++--------- .../tables/triggers/tests/test_triggers_delete.py | 18 +++++++++--------- .../tables/triggers/tests/test_triggers_get.py | 18 +++++++++--------- .../tables/triggers/tests/test_triggers_put.py | 20 ++++++++++---------- .../databases/schemas/tables/triggers/tests/utils.py | 5 +++-- .../databases/schemas/tests/test_schema_add.py | 6 +++--- .../databases/schemas/tests/test_schema_delete.py | 6 +++--- .../databases/schemas/tests/test_schema_get.py | 8 ++++---- .../databases/schemas/tests/test_schema_put.py | 6 +++--- .../servers/databases/schemas/tests/utils.py | 5 +++-- .../databases/schemas/types/tests/test_types_add.py | 10 +++++----- .../schemas/types/tests/test_types_delete.py | 10 +++++----- .../databases/schemas/types/tests/test_types_get.py | 10 +++++----- .../databases/schemas/types/tests/test_types_put.py | 12 ++++++------ .../servers/databases/schemas/types/tests/utils.py | 5 +++-- .../databases/schemas/views/tests/test_views_add.py | 12 ++++++------ .../schemas/views/tests/test_views_delete.py | 12 ++++++------ .../databases/schemas/views/tests/test_views_get.py | 12 ++++++------ .../databases/schemas/views/tests/test_views_put.py | 14 +++++++------- .../servers/databases/schemas/views/tests/utils.py | 5 +++-- .../servers/databases/tests/test_db_add.py | 4 ++-- .../servers/databases/tests/test_db_delete.py | 4 ++-- .../servers/databases/tests/test_db_get.py | 2 +- .../servers/databases/tests/test_db_put.py | 2 +- .../server_groups/servers/databases/tests/utils.py | 2 +- .../tests/test_resource_groups_add.py | 6 +++--- .../tests/test_resource_groups_delete.py | 4 ++-- .../tests/test_resource_groups_put.py | 6 +++--- .../tests/tests_resource_groups_get.py | 4 ++-- .../servers/resource_groups/tests/utils.py | 3 ++- .../servers/roles/tests/test_role_add.py | 4 ++-- .../servers/roles/tests/test_role_delete.py | 2 +- .../servers/roles/tests/test_role_get.py | 2 +- .../servers/roles/tests/test_role_put.py | 2 +- .../server_groups/servers/roles/tests/utils.py | 7 ++----- .../servers/tablespaces/tests/test_tbspc_add.py | 5 +++-- .../servers/tablespaces/tests/test_tbspc_delete.py | 5 +++-- .../servers/tablespaces/tests/test_tbspc_get.py | 4 ++-- .../servers/tablespaces/tests/test_tbspc_put.py | 2 +- .../server_groups/servers/tablespaces/tests/utils.py | 5 ++--- .../connect/sql/tests/test_check_recovery.py | 2 +- .../server_groups/servers/tests/test_server_add.py | 2 +- .../servers/tests/test_server_delete.py | 2 +- .../server_groups/servers/tests/test_server_get.py | 2 +- .../server_groups/servers/tests/test_server_put.py | 3 ++- .../browser/server_groups/servers/tests/utils.py | 2 +- web/pgadmin/browser/tests/test_change_password.py | 4 ++-- web/pgadmin/browser/tests/test_login.py | 3 ++- web/pgadmin/browser/tests/test_logout.py | 2 +- web/pgadmin/browser/tests/test_reset_password.py | 4 ++-- .../feature_tests/connect_to_server_feature_test.py | 2 +- .../copy_selected_columns_feature_test.py | 4 ++-- web/pgadmin/feature_tests/table_ddl_feature_test.py | 2 +- web/regression/{ => python_test_utils}/test_utils.py | 0 web/regression/runtests.py | 2 +- 188 files changed, 864 insertions(+), 801 deletions(-) rename web/regression/{ => python_test_utils}/test_utils.py (100%) 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 fb5396ce..cf1dc9fc 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.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 cast_utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_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 c60efc16..210e49d1 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.browser.server_groups.servers.databases.tests import \ + utils as database_utils 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 cast_utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_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 88663575..814508b5 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.browser.server_groups.servers.databases.tests import \ + utils as database_utils 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 cast_utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_utils -import os -import sys 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 db7c7189..8a3e7cb0 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.browser.server_groups.servers.databases.tests import \ + utils as database_utils 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 cast_utils -from pgadmin.browser.server_groups.servers.databases.tests import \ - utils as database_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 a9f4a936..b1875c02 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 ca00c938..23307886 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 57164ca4..e8dd4ae8 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 f209d0fe..540dacfb 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 da737fd9..d232cdbd 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 9a1430c9..1e4040d9 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 d2f4de30..c600d953 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 179d651f..6fa19812 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 42addde1..a12b22b5 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 363da170..c47d37f3 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 9d234db1..1bf12163 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 a121c229..e5972a15 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 +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 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 a14ff269..4dd6e2f5 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 a1907b19..e2ceb7ed 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 1ecbe546..fa682005 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py index cc1915b5..affeac3e 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 170c154c..96955c65 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 +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.\ + 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 pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers.\ - foreign_servers.tests import utils as fsrv_utils +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 d9b5762b..b4896e44 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. \ + 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 pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ - foreign_servers.tests import utils as fsrv_utils +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 978e6384..50ebba8a 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. \ + 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 pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ - foreign_servers.tests import utils as fsrv_utils +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 2faa5aa9..cf077b41 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 +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. \ + 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 pgadmin.browser.server_groups.servers.databases.foreign_data_wrappers. \ - foreign_servers.tests import utils as fsrv_utils +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 59e79277..ee13329c 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 f1706cd0..e760d93d 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 a14bed3b..cb758c65 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 9a307fb4..5a1bd93d 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 2ddb242c..bc12d390 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 +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 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 4379f15e..6f429a78 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 87aa81a8..ecd8e96f 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 3cbe4fbe..cb189bcf 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 e55afea5..c4f3829c 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 941bdc6d..1df99ea8 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 de4ee47d..a1ef6f9f 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 2748d361..5f675c3a 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 81db0c43..3729b870 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 5f5b983d..411cdeb8 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 359d68ef..b5f38a58 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 68494414..98bab960 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 +import traceback -from regression import test_utils as utils +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 0fbc4f87..cb4dbc49 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 c2ccb8a1..21f9248d 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 6a93ab5e..17d215a1 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 15d7853e..b71a1e24 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 6cacff23..83559bf2 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 +import traceback -from regression import test_utils as utils +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 4cc0f1b0..d11e11c2 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 +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 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 10ffc31c..86ea0ae6 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 25fbdecb..7c4faf1c 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 62eecc5e..b46e1844 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py index 67ecf3e8..df631b6c 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 6fcb0bfb..55a0be8c 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 +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.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 7d42f1aa..3ab0d81c 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 8276eef7..b148db38 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 174eb526..1c66543f 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py index 10d5e7be..4175b195 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 468715ff..bb484ba8 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 +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 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 3b470614..a76bea5c 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 2e71f447..966ece42 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 208877dd..ee043206 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py index a9d0cd20..f2a5780a 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 1d33f726..3ae500b2 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 +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 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 c84b53f9..b6516304 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 826fc15b..07c8eea9 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 74b8dd07..7eb17b2e 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/utils.py index a85fb7d0..728f5519 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 800e7d26..8683ff25 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 +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 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 c4e618a7..68cb823e 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 4739dc09..cff9696a 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 aa96fb5d..3d314f57 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 +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/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py index 38ac3ae2..619fbd60 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 bb5a8adf..dcbf9ffc 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 95b4a2ae..a8bd2160 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 dd6d844f..a5abaa7d 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 2ff28b4a..a5fbe182 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 98821934..74344f1a 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 +import traceback -from regression import test_utils as utils +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 fbd3352e..144e148a 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 e3d9ca62..1d767e8e 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 5862eb12..87e7d9af 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 2c5bbcc4..2c960e27 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 1e2070ad..24187d6f 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 +import traceback -from regression import test_utils as utils +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 1d9737ba..583b5145 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 0f87b666..a6f6f413 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 9c38186e..56afcc24 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 8efbd7ae..e7c33446 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 958c002a..d114d50a 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 +import traceback -from regression import test_utils as utils +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 bfe3d137..53c3fca7 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 6ba8d204..cb6d69b2 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 640d5ac6..4fdbd061 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 badbbd81..0391add0 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 99a9d5f4..f49669a1 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 +import traceback -from regression import test_utils as utils +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 8d42a798..6fc8b050 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 d7cc6967..d558cee4 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 0cc88e8d..713d9992 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 f94b8ac5..656cb83e 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 830dd4b6..103ee784 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 +import traceback -from regression import test_utils as utils +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 1a79bc5a..1e28d51c 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 03f37ae2..0dd361dc 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 3a16e4c8..ee94bbc4 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 3c4b673e..6192ae5a 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 ae0c8921..9eb96173 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 +import traceback -from regression import test_utils as utils +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 14ccc53a..dfd4e63a 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 9b8a468b..166d6b16 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 e9024613..55b4929b 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 375ff279..1668fdbb 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 5e71c911..6ee49470 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 +import traceback -from regression import test_utils as utils +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 c33b14a1..7e8a9018 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 f5bccb44..c9492d08 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 576bf66d..be126f64 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 72d44e37..c9e1be85 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 3f091c49..af3cf0c1 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 +import traceback -from regression import test_utils as utils +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 ea282606..4a03a1a5 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 45d5588e..a00ce818 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 ac138e54..a3d3c3bc 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 963e8bee..148f8565 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 78f81c2b..13860682 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 +import traceback -from regression import test_utils as utils +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 995e3ac2..dd8a4cb1 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 8a036244..b0c99dd3 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 bbf5f97c..b349878c 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 740e8258..a0425809 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 b7b213b9..611c6b3a 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 +import traceback -from regression import test_utils as utils +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 685c1106..7be945c7 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 49f5175f..b1984bda 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 18517faa..faef8d23 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 4eb0e021..60b4c8ac 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 bf54a390..20a645a3 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 2c7cd5bf..a553bd9b 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 6808d452..f2b637ee 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 208cf003..b23bf60a 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 ce2be9fa..0703cba3 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 a488b9ab..1b2f9f55 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 4a1d9d9d..2a1d9695 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 3f2ca75d..bfbf884f 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 05bbced6..456f0202 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 +import traceback -from regression import test_utils as utils +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 b1659eec..f2398aa8 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 121c0f1d..1ea4bde6 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 8ea0bfa9..58dd9293 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 822fc5cd..7166c1fe 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 f4e1e3e0..b5b042ea 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 +import traceback -from regression import test_utils as utils +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 7e47ae5c..9a98dcc1 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 d6bc7fb9..cfedec58 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 03963eac..d39692be 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 fbb760dc..8835c525 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 def86c2b..fca2add9 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 +import uuid -from regression import test_utils as utils +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 a6711304..a1d98d09 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 d10a64e3..8f18b8e4 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 a15f839b..3fe57af1 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 47c6b585..6a7017b3 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 39895c42..8c57339b 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 +import traceback -from regression import test_utils as utils +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 8f7df85d..1cc23fa6 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 ea5dd0ef..4a41e586 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 f3a01fd7..9d2cacef 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 77cd3ab7..05c18512 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 757e6a2d..11e8f73a 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 +import traceback -from regression import test_utils as utils +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 2c2c4e16..10aab87d 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.browser.server_groups.servers.tests import utils as server_utils 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 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 407eb8bf..e9f3946f 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.browser.server_groups.servers.tests import utils as server_utils 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 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 57fdd693..ee187c2a 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 84ffad3e..6bd36e60 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 484d3e6b..05ced56e 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 c4b1b41e..ab69f0dc 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.browser.server_groups.servers.tests import utils as server_utils 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 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 8d018e70..3ce9b793 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.browser.server_groups.servers.tests import utils as server_utils 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 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 559c826c..51a80f83 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.browser.server_groups.servers.tests import utils as server_utils 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 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 661474cd..1cae34ee 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.browser.server_groups.servers.tests import utils as server_utils 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 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 7f13054e..82ff963e 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 4678f149..03cbd46c 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.browser.server_groups.servers.tests import utils as server_utils 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 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 70584e16..6084b8fc 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 eb813768..2a816bbf 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 c136ed0e..0b7aa5a9 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 fad1a345..24d28799 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 775ff180..b5a1b838 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.browser.server_groups.servers.tests import utils as server_utils 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 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 1b6ccd47..16a37d80 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 92fb0079..11bd6168 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.browser.server_groups.servers.tests import utils as server_utils 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 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 2662d796..59263429 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 d44129cc..865531e2 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 47c7b487..90b2e520 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 18c171e7..ee80dc4f 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 7de995c9..9b622c6d 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 be939ca5..a91c6e4d 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 25679bd3..e3b1c286 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 b906a9ef..f510ba4c 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 b0258f42..ddeb9f36 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 4467bb88..f9b8e7c8 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 35c1fad3..914a0733 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 dfa74082..18ee0865 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 937da2da..97cd6afa 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/copy_selected_columns_feature_test.py b/web/pgadmin/feature_tests/copy_selected_columns_feature_test.py index 7ec7e832..7d300906 100644 --- a/web/pgadmin/feature_tests/copy_selected_columns_feature_test.py +++ b/web/pgadmin/feature_tests/copy_selected_columns_feature_test.py @@ -7,13 +7,13 @@ # ########################################################################## -import pyperclip import time +import pyperclip from selenium.webdriver import ActionChains -from regression import test_utils from regression.feature_utils.base_feature_test import BaseFeatureTest +from regression.python_test_utils import test_utils class CopySelectedColumnsFeatureTest(BaseFeatureTest): diff --git a/web/pgadmin/feature_tests/table_ddl_feature_test.py b/web/pgadmin/feature_tests/table_ddl_feature_test.py index 2f364437..7f306d38 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/test_utils.py b/web/regression/python_test_utils/test_utils.py similarity index 100% rename from web/regression/test_utils.py rename to web/regression/python_test_utils/test_utils.py diff --git a/web/regression/runtests.py b/web/regression/runtests.py index c225208f..289c2f9a 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 -- 2.12.0