diff --git a/web/.gitignore b/web/.gitignore new file mode 100644 index 00000000..3ce1d246 --- /dev/null +++ b/web/.gitignore @@ -0,0 +1 @@ +.pytest_cache diff --git a/web/__init__.py b/web/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/web/config.py b/web/config.py index 3d8f6f7d..3629df28 100644 --- a/web/config.py +++ b/web/config.py @@ -116,10 +116,13 @@ NODE_BLACKLIST = [] # from it, notably various paths such as LOG_FILE and anything # using DATA_DIR. -if builtins.SERVER_MODE is None: +try: + if builtins.SERVER_MODE is None: + SERVER_MODE = True + else: + SERVER_MODE = builtins.SERVER_MODE +except AttributeError: SERVER_MODE = True -else: - SERVER_MODE = builtins.SERVER_MODE # User ID (email address) to use for the default user in desktop mode. # The default should be fine here, as it's not exposed in the app. diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py index b902c48b..5158e02d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class CastTestGenerator(BaseTestGenerator): 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 de8f9799..1151373a 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 @@ -13,7 +13,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as cast_utils 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 b956fcbc..aaa0be30 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 @@ -11,7 +11,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as cast_utils 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 d67f55ae..7d1c63a5 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 @@ -11,7 +11,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as cast_utils 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 99485095..d0e00bbd 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 @@ -13,7 +13,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as cast_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py index ed456343..4e3877a3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class EventTriggerGeneratorTestCase(BaseTestGenerator): 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 a6639075..9b803ac0 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils from regression.python_test_utils import test_utils as utils 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 c0b92913..dde167e2 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils from regression.python_test_utils import test_utils as utils 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 c263a6b0..8d99dfb3 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils from regression.python_test_utils import test_utils as utils 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 32fbfb8c..33e02337 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression import trigger_funcs_utils from regression.python_test_utils import test_utils as utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py index 3900c557..e2051d34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ExtensionGeneratorTestCase(BaseTestGenerator): 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 f4398d55..640b9eab 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 @@ -13,7 +13,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 a1644a59..7782df5f 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 @@ -11,7 +11,7 @@ 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 pgadmin.utils.base_test_generator 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 2401f1ed..17cc4116 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 @@ -11,7 +11,7 @@ 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 pgadmin.utils.base_test_generator 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 39598982..dbb11ef0 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 @@ -13,7 +13,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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/external_tables/tests/test_external_tables_module.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py index f8c47ab3..643b6d6b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py @@ -13,7 +13,7 @@ import six from pgadmin.browser.server_groups.servers\ .databases.external_tables import ExternalTablesModule -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import MagicMock, Mock diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py index 3658148f..4d975f57 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py @@ -12,7 +12,7 @@ import sys from pgadmin.browser.server_groups.servers.databases.external_tables import \ ExternalTablesView -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import MagicMock, patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py index f09b3ff0..37341180 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_mapping_utils.py @@ -10,7 +10,7 @@ from pgadmin.browser.server_groups.servers.databases \ .external_tables.mapping_utils import \ map_column_from_database, map_table_information_from_database, \ is_web_table, format_options, map_execution_location, map_format_type -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestMappingUtils(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py index 718151b5..17f1f647 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py @@ -12,7 +12,7 @@ from pgadmin.browser.server_groups.servers.databases \ .external_tables import Properties from pgadmin.browser.server_groups.servers.databases.external_tables \ .properties import PropertiesException, PropertiesTableNotFoundException -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import MagicMock, patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py index b09040f6..1ea282f4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py @@ -12,7 +12,7 @@ import sys from pgadmin.browser.server_groups.servers.databases \ .external_tables.reverse_engineer_ddl import \ ReverseEngineerDDL, ReverseEngineerDDLException -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import MagicMock diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py index 12df4f9d..fda0713d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ForeignServersGeneratorTestCase(BaseTestGenerator): 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 abed9d0c..604d4833 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 4e5c70ed..ed87524f 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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 c2fcffbb..72440d49 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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 77c5ce25..3d7bd9ea 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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/user_mapping/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/__init__.py index 54417f53..fc2eb0fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class UserMappingGeneratorTestCase(BaseTestGenerator): 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 fc5af27e..f525ee3d 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 @@ -20,7 +20,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 a75d6e83..edc69816 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 @@ -19,7 +19,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py index 5e4e78c1..3be9d929 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 @@ -19,7 +19,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py index 025b571a..2a5decde 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 @@ -20,7 +20,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as um_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py index c78ade34..9a6cb6cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class FDWGeneratorTestCase(BaseTestGenerator): 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 3686da4b..e4f65b4c 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 @@ -13,7 +13,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as fdw_utils 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 73fa07ed..00d88647 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 @@ -13,7 +13,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as fdw_utils 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 80a8ed14..405d1c86 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 @@ -13,7 +13,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as fdw_utils 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 cec0264b..85f15cdc 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 @@ -14,7 +14,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as fdw_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py index b059d414..57b0a86d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class LanguageTestGenerator(BaseTestGenerator): 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 8fd6779d..c366ee35 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 @@ -14,7 +14,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 6ac24d62..b1c1ccc5 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 @@ -13,7 +13,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 2aaa22f6..3d58327d 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 @@ -13,7 +13,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 ba4d0eb9..e73994fd 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 @@ -14,7 +14,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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/schemas/collations/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py index ccd081c4..761cb027 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class CollationTestGenerator(BaseTestGenerator): 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 3c2a931f..72fd0a79 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 add8d56a..ef8a9650 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 9a5eb207..8cd9abcd 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 4c7ae775..17c039d0 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator 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/domains/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py index 09655f13..3506fbe8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class DomainTestGenerator(BaseTestGenerator): 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 fb7e66cb..fa0acea3 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 4a42d481..244061c0 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 6b5edc84..bdaa8b21 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 fabbb206..e1e8f949 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator 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/foreign_tables/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py index 58a11d1d..fb4a27c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ForeignTableGeneratorTestCase(BaseTestGenerator): 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 8a680c2e..5988a426 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py index 414f86f7..0271b55c 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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 0a500733..29d3f823 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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 af9bc022..7568df14 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict 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/fts_configurations/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py index 3221d438..3332a59e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class FTSConfigurationTestGenerator(BaseTestGenerator): 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 9f277721..0298e3fb 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 @@ -20,7 +20,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas \ .fts_configurations.tests import utils as fts_config_utils from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 0a5cc16b..bbc9746c 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 6d959b5c..e94bcf73 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 @@ -17,7 +17,7 @@ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas \ .fts_configurations.tests import utils as fts_config_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 7607b395..313360c0 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 @@ -18,7 +18,7 @@ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas \ .fts_configurations.tests import utils as fts_config_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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_dictionaries/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py index 8f5b6fb2..699f6864 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ForeignTableTestGenerator(BaseTestGenerator): 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 c419a2da..0b20a78f 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 @@ -18,7 +18,7 @@ from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.browser.server_groups.servers.databases.schemas \ .fts_dictionaries.tests import utils as fts_dict_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 7c93a37a..f1587839 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 b670b0ae..5b71c745 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 7939af49..70f98f8a 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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_parser/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/__init__.py index 8f5b6fb2..699f6864 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ForeignTableTestGenerator(BaseTestGenerator): 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 ff193e24..dd877f86 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parser/tests/test_fts_parser_delete.py index 664fed64..966b83d4 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 c18c55a3..5a469784 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 b1ef78d3..eff48983 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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_templates/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py index 8f5b6fb2..699f6864 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ForeignTableTestGenerator(BaseTestGenerator): 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 12c44a85..689b748a 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py index 8edab974..375cf0d5 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 fa64648f..56a74e25 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 8c4da979..ef4b7358 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/functions/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py index 47cb9031..9034d2f9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TriggerFunctionTestGenerator(BaseTestGenerator): 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 d238bf01..82e47c9e 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 3d1fe9fe..02b83f76 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 7eb0d2a3..cebd65c5 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py index 63d4c085..c76f3aae 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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/packages/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py index e65af20c..7e6b45d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class PackageTestGenerator(BaseTestGenerator): 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 fa7410c7..8aabf568 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 d62e016a..6ae8c0d2 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 1c4e1bf0..bcd27be0 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 5e59547c..22e07dbb 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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/sequences/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py index 6ab8c7ef..94a16c34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class SequenceTestGenerator(BaseTestGenerator): 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 d580159d..55ec366a 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 a11c5be5..604f1b1c 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 199ca37f..67c58ffb 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 6f563ad6..e042ae60 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator 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/synonyms/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py index 3cac44f7..adc54b5d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class SynonymTestGenerator(BaseTestGenerator): 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 d93db98a..e53df44c 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 @@ -17,7 +17,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 05238be6..be43f915 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 @@ -16,7 +16,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 d8acee46..1fd33c45 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 @@ -16,7 +16,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 9e80b4b0..141a8894 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 @@ -19,7 +19,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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/tables/column/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/__init__.py index a1ae31da..622c3ec7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ColumnsTestGenerator(BaseTestGenerator): 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 a2a8f179..02d31705 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 1496ea86..636f0625 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 22bfb11e..9194503a 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_msql.py index 0cbcaf11..42c6fa7d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/tests/test_column_msql.py @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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 922ebb2f..f8c717c4 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/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 b202a18c..3c2dad19 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 acca9fd3..3691bfc1 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 41247b5a..9c573147 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 b2400602..5068a0a8 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/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 79b14d75..8c7a14dc 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 fcf3259d..6e40d9f7 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 d233e9e0..09c75b98 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 cdcaed5d..b7a55d62 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/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 ceeb6350..c4239ea7 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 526b36cd..23f498dc 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 31412176..513f6867 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 ef0e3ade..e3061786 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py index 51209782..05e2e0e5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ConstraintsTestGenerator(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py index 92138d8f..70839ede 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class IndexesTestGenerator(BaseTestGenerator): 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 11fc64be..19a8fc43 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 ae278338..ddd3e922 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator 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 3cfd7508..0e4f133f 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator 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 6c2c79d6..ca6e6041 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator 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/partitions/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py index a4335b41..42c408a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py @@ -11,7 +11,7 @@ import sys from pgadmin.browser.server_groups.servers.databases.schemas.tables.\ partitions import PartitionsModule -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import patch, Mock, call diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py index d1f2ecc1..63b06d29 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class RulesTestGenerator(BaseTestGenerator): 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 3955860a..6b4df824 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 39830fd2..a56b9274 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 0250f087..41429ffa 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 @@ -15,7 +15,7 @@ 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 pgadmin.utils.base_test_generator 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 4f89e253..d1de3c50 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 @@ -16,7 +16,7 @@ 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 pgadmin.utils.base_test_generator 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/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 51af42cd..b1ee2741 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 @@ -14,7 +14,7 @@ from pgadmin.utils.driver import DriverRegistry from regression.python_test_utils.template_helper import file_as_template DriverRegistry.load_drivers() -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils if sys.version_info[0] >= 3: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py index 94faaf55..549f46a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TablesTestGenerator(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py index 38c040f0..be570f3a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_base_partition_table.py @@ -8,7 +8,7 @@ ########################################################################## from pgadmin.browser.server_groups.servers.databases.schemas\ .tables.base_partition_table import BasePartitionTable -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestBasePartitionTable(BaseTestGenerator): 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 4c3cde31..17009bfc 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 17b3d01b..2200a913 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 bab21fdd..6c7af609 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 63f73eae..b5580a32 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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_template_create.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py index b80a9006..71a9160a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py @@ -16,7 +16,7 @@ from jinja2 import FileSystemLoader, ChoiceLoader from config import PG_DEFAULT_DRIVER from pgadmin import VersionedTemplateLoader from pgadmin.utils.driver import get_driver -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestTemplateCreate(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py index a4dd5b69..d9a7a23c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py @@ -9,7 +9,7 @@ import sys from pgadmin.browser.server_groups.servers.databases.schemas.tables import \ BaseTableView -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import patch, MagicMock diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py index 5f074163..096ce176 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TriggersTestGenerator(BaseTestGenerator): 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 74a92621..30ec4627 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 f7e71412..693af808 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator 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 e23b6149..8847ef27 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 @@ -17,7 +17,7 @@ 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 pgadmin.utils.base_test_generator 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 927231f2..81153818 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 @@ -18,7 +18,7 @@ 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 pgadmin.utils.base_test_generator 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/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py index 34a3f666..d63e460d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class SchemaTestGenerator(BaseTestGenerator): 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 c19fda8d..04550eab 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 @@ -12,7 +12,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 ae8e047b..97ed6b2e 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 @@ -11,7 +11,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 d1036b33..5f0df1f0 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 @@ -10,7 +10,7 @@ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 39d2bf91..9345ab53 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 @@ -12,7 +12,7 @@ import uuid from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py index 826c003c..65b5d876 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py @@ -9,9 +9,11 @@ import sys +from grappa import should + from pgadmin.browser.server_groups.servers.databases.schemas.utils import \ DataTypeReader -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import patch, Mock @@ -43,7 +45,7 @@ _default_manager = dict( ) -class DataTypeReaderTest(BaseTestGenerator): +class TestDataTypeReader(BaseTestGenerator): scenarios = [ ('Schema Oid is passed to the SQL Renderer', dict( @@ -85,7 +87,8 @@ class DataTypeReaderTest(BaseTestGenerator): @patch('pgadmin.browser.server_groups.servers.databases.schemas.utils' '.render_template') - def runTest(self, template_mock): + def test_all(self, template_mock, args, kwargs): + self._expand_test_object(kwargs) template_mock.return_value = 'Some SQL' connection = Mock() connection.execute_2darray.return_value = [ @@ -106,8 +109,10 @@ class DataTypeReaderTest(BaseTestGenerator): '' result = reader.get_types(connection, self.sql_condition, self.add_serials, self.schema_oid) - self.assertEqual(result[1], self.expected_function_output) - self.assertTrue(result[0]) + + result | should.have.length.of(2) + result[1] | should.be.equal.to(self.expected_function_output) + result[0] | should.be.true connection.execute_2darray.assert_called_with('Some SQL') template_mock.assert_called_with( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py index f3c56409..be3addca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TypesTestGenerator(BaseTestGenerator): 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 70b64a65..7cd51c4c 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 0c887e3d..c62031b8 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 d76256be..cdec4bc9 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 @@ -13,7 +13,7 @@ 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 pgadmin.utils.base_test_generator 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 753b4e42..f9c96b2c 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 @@ -14,7 +14,7 @@ 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 pgadmin.utils.base_test_generator 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/views/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py index 25b6a694..ff882912 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ViewsTestGenerator(BaseTestGenerator): 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 eb1404e7..2a8ec484 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 f5967305..22863c31 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as views_utils 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 2c6c14fc..52d08d9c 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 @@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as views_utils 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 78cbe25b..26d775c9 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 @@ -15,7 +15,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as views_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py index 7fce782d..85ad0df6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class DatabaseCreateTestCase(BaseTestGenerator): 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 88b982f8..225414ed 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 @@ -10,7 +10,7 @@ import json from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py index 8c925c33..b50cfcb4 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 @@ -10,7 +10,7 @@ import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 3ff0d90d..06de2fb1 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 @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py index e5598468..f2c4b2a8 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 @@ -10,7 +10,7 @@ import json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py index 61f4d19a..bcda7555 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class PgAgentCreateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py index 7eb499f7..fc1af2fa 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py @@ -9,7 +9,7 @@ import simplejson as json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from . import utils as pgagent_utils diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py index f9bcb087..5ba617cb 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py @@ -8,7 +8,7 @@ ########################################################################## import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from . import utils as pgagent_utils diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py index 08ffc6b9..065671f6 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py @@ -8,7 +8,7 @@ ########################################################################## import simplejson as json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from . import utils as pgagent_utils diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py index 1c2e5115..7e781111 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py @@ -8,7 +8,7 @@ ########################################################################## import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from . import utils as pgagent_utils diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py index 3bc3d0f6..d17ff107 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py @@ -8,7 +8,7 @@ ########################################################################## import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from . import utils as pgagent_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py index 9968fcae..63057bb1 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ResourceGroupsCreateTestCase(BaseTestGenerator): 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 c1793bc6..cdd2fda0 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 @@ -11,7 +11,7 @@ import json import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py index be7eedcf..073b23d1 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 @@ -10,7 +10,7 @@ import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py index bd66701d..220f0e34 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 @@ -11,7 +11,7 @@ import json import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py index 1c4f76a7..6a47a374 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 @@ -10,7 +10,7 @@ import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as resource_groups_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py index a3d91465..dc17d132 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class RoleGeneratorTestCase(BaseTestGenerator): 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 e2eeb2d5..d4a2a607 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 @@ -10,7 +10,7 @@ import json from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py index 22c6db2f..eba8aaa3 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 @@ -9,7 +9,7 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py index bbb1a0a7..a809aacd 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 @@ -9,7 +9,7 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py index e5e00930..ee09d17c 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 @@ -10,7 +10,7 @@ import json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as roles_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py index fc757f12..c7cde65d 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TblspaceGeneratorTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py index d8f46498..8e2e1798 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py @@ -14,7 +14,7 @@ else: from unittest.mock import MagicMock from pgadmin.browser.server_groups.servers.tablespaces import TablespaceModule -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class BackendSupportedTestCase(BaseTestGenerator): 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 c8b9b0ba..96d4872f 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 @@ -12,7 +12,7 @@ from __future__ import print_function import json from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py index 4e16bf7a..c53ec092 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 @@ -12,7 +12,7 @@ from __future__ import print_function import json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py index 2154e7e6..1bf52e9b 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 @@ -10,7 +10,7 @@ import uuid from pgadmin.utils import server_utils as server_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py index e1cee04f..5dfec76f 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 @@ -10,7 +10,7 @@ import json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as tablespace_utils diff --git a/web/pgadmin/browser/server_groups/servers/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/tests/__init__.py index 1b7a2432..3e7924f1 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ServerGenerateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py index 3b03d494..6e9ea63f 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py @@ -9,7 +9,7 @@ import json -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py b/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py index b31fcc19..e42c6afe 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py @@ -1,6 +1,6 @@ import os -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py index bcc32a31..519178cc 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py b/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py index 9efe4d6a..96a6cb38 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_role_dependencies_sql.py @@ -8,7 +8,7 @@ ########################################################################## import os -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils from regression.python_test_utils.template_helper import file_as_template 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 5ad04694..baee95af 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 @@ -9,7 +9,7 @@ import json -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils 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 64d069cd..308d2451 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 @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils 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 4887e33c..d4dd79a5 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 @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils 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 303d14e1..54c87901 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 @@ -9,7 +9,7 @@ import json -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils diff --git a/web/pgadmin/browser/server_groups/tests/__init__.py b/web/pgadmin/browser/server_groups/tests/__init__.py index 21b02cad..58d12a9f 100644 --- a/web/pgadmin/browser/server_groups/tests/__init__.py +++ b/web/pgadmin/browser/server_groups/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class SGGenerateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/tests/test_sg_get.py b/web/pgadmin/browser/server_groups/tests/test_sg_get.py index def75a7b..f237dff9 100644 --- a/web/pgadmin/browser/server_groups/tests/test_sg_get.py +++ b/web/pgadmin/browser/server_groups/tests/test_sg_get.py @@ -9,7 +9,7 @@ import json -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.test_setup import config_data diff --git a/web/pgadmin/browser/tests/__init__.py b/web/pgadmin/browser/tests/__init__.py index 7ce53131..102e5161 100644 --- a/web/pgadmin/browser/tests/__init__.py +++ b/web/pgadmin/browser/tests/__init__.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class BrowserGenerateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index 5b337db7..c3443647 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -10,7 +10,7 @@ import json import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils from regression.test_setup import config_data from . import utils diff --git a/web/pgadmin/browser/tests/test_gravatar_image_display.py b/web/pgadmin/browser/tests/test_gravatar_image_display.py index a4526c9d..87b5654c 100644 --- a/web/pgadmin/browser/tests/test_gravatar_image_display.py +++ b/web/pgadmin/browser/tests/test_gravatar_image_display.py @@ -8,7 +8,7 @@ ########################################################################## import config -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from regression.test_setup import config_data as tconfig diff --git a/web/pgadmin/browser/tests/test_login.py b/web/pgadmin/browser/tests/test_login.py index d830dfbc..2c2221c1 100644 --- a/web/pgadmin/browser/tests/test_login.py +++ b/web/pgadmin/browser/tests/test_login.py @@ -9,7 +9,7 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils from regression.test_setup import config_data diff --git a/web/pgadmin/browser/tests/test_logout.py b/web/pgadmin/browser/tests/test_logout.py index 51c206f4..0f44e139 100644 --- a/web/pgadmin/browser/tests/test_logout.py +++ b/web/pgadmin/browser/tests/test_logout.py @@ -8,7 +8,7 @@ ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils as utils diff --git a/web/pgadmin/browser/tests/test_reset_password.py b/web/pgadmin/browser/tests/test_reset_password.py index 7bad400a..a03e88d2 100644 --- a/web/pgadmin/browser/tests/test_reset_password.py +++ b/web/pgadmin/browser/tests/test_reset_password.py @@ -9,7 +9,7 @@ import uuid -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator 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 diff --git a/web/pgadmin/browser/tests/test_version_in_range.py b/web/pgadmin/browser/tests/test_version_in_range.py index 4d9ca76d..79e033ae 100644 --- a/web/pgadmin/browser/tests/test_version_in_range.py +++ b/web/pgadmin/browser/tests/test_version_in_range.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.browser.utils import is_version_in_range diff --git a/web/pgadmin/conftest.py b/web/pgadmin/conftest.py new file mode 100644 index 00000000..22d2ca1a --- /dev/null +++ b/web/pgadmin/conftest.py @@ -0,0 +1,105 @@ +########################################################################## +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# +########################################################################## +import os + +import pytest + +import config +from pgadmin import create_app +from pgadmin.model import SCHEMA_VERSION +from regression import test_setup +from regression.python_test_utils import test_utils + +# Delete SQLite db file if exists +if os.path.isfile(config.TEST_SQLITE_PATH): + os.remove(config.TEST_SQLITE_PATH) + +os.environ["PGADMIN_TESTING_MODE"] = "1" + +# Disable upgrade checks - no need during testing, and it'll cause an error +# if there's no network connection when it runs. +config.UPGRADE_CHECK_ENABLED = False + +pgadmin_credentials = test_setup.config_data + +# Set environment variables for email and password +os.environ['PGADMIN_SETUP_EMAIL'] = '' +os.environ['PGADMIN_SETUP_PASSWORD'] = '' +if pgadmin_credentials: + if 'pgAdmin4_login_credentials' in pgadmin_credentials: + if all(item in pgadmin_credentials['pgAdmin4_login_credentials'] + for item in ['login_username', 'login_password']): + pgadmin_credentials = pgadmin_credentials[ + 'pgAdmin4_login_credentials'] + os.environ['PGADMIN_SETUP_EMAIL'] = str(pgadmin_credentials[ + 'login_username']) + os.environ['PGADMIN_SETUP_PASSWORD'] = str(pgadmin_credentials[ + 'login_password']) + +# Execute the setup file +exec(open("setup.py").read()) + +config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION + +# Create the app +app = create_app() +app.config['WTF_CSRF_ENABLED'] = False +app.PGADMIN_KEY = '' +app.config.update({'SESSION_COOKIE_DOMAIN': None}) +test_client = app.test_client() +driver = None +app_starter = None +handle_cleanup = None + +server_info = test_utils.get_config_data() + +@pytest.fixture(scope="session", autouse=True) +def do_test_server(): + server_information = test_utils.create_parent_server_node(server_info[0]) + + yield server_information + + test_utils.delete_test_server(test_client) + + +@pytest.fixture(scope='module') +def context_of_tests(do_test_server): + yield { + 'server_information': do_test_server, + 'test_client': test_client, + 'server': server_info[0] + } + + +def pytest_generate_tests(metafunc): + if not hasattr(metafunc.cls, 'scenarios'): + return + + list_of_scenario_names = [] + scenario_parameters = [] + for scenario in metafunc.cls.scenarios: + list_of_scenario_names.append(scenario[0]) + scenario_parameters.append(('', scenario[1])) + metafunc.parametrize('args,kwargs', + scenario_parameters, + ids=list_of_scenario_names, + scope="class", + indirect=False) + + +def pytest_itemcollected(item): + par = item.parent.obj + node = item.obj + pref = par.__doc__.strip() if par.__doc__ else par.__class__.__name__ + suf = node.__doc__.strip() if node.__doc__ else node.__name__ + if item._genid is not None: + suf = item._genid + + if pref or suf: + item._nodeid = ' '.join((pref, suf)) diff --git a/web/pgadmin/dashboard/tests/test_dashboard_templates.py b/web/pgadmin/dashboard/tests/test_dashboard_templates.py index 205e50b6..3ec7cf35 100644 --- a/web/pgadmin/dashboard/tests/test_dashboard_templates.py +++ b/web/pgadmin/dashboard/tests/test_dashboard_templates.py @@ -12,7 +12,7 @@ import sys from flask import Flask, render_template from jinja2 import FileSystemLoader from pgadmin import VersionedTemplateLoader -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import MagicMock diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py index c8c32cfc..11ddc4a5 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py @@ -13,7 +13,7 @@ from flask import Flask, render_template from jinja2 import FileSystemLoader from pgadmin import VersionedTemplateLoader -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestExplainPlanTemplates(BaseTestGenerator): diff --git a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py index beca1657..083c8744 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py +++ b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py @@ -10,7 +10,7 @@ from werkzeug.datastructures import ImmutableMultiDict from pgadmin.tools.sqleditor import extract_sql_from_network_parameters -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class ExtractSQLFromNetworkParametersTest(BaseTestGenerator): diff --git a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py index e0a8d388..ca55c2e7 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py @@ -11,7 +11,7 @@ import json from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression import parent_node_dict from regression.python_test_utils import test_utils as utils diff --git a/web/pgadmin/tools/sqleditor/tests/test_pref_utilities.py b/web/pgadmin/tools/sqleditor/tests/test_pref_utilities.py index cbd141b0..13bf1870 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_pref_utilities.py +++ b/web/pgadmin/tools/sqleditor/tests/test_pref_utilities.py @@ -6,7 +6,7 @@ # This software is released under the PostgreSQL Licence # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.tools.sqleditor.utils.query_tool_preferences import \ get_text_representation_of_shortcut diff --git a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py index c2ff21c5..51682026 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py @@ -8,7 +8,9 @@ ########################################################################## import sys -from pgadmin.utils.route import BaseTestGenerator +from grappa import should + +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.tools.sqleditor import StartRunningQuery if sys.version_info < (3, 3): @@ -17,15 +19,16 @@ else: from unittest.mock import patch, ANY -class StartQueryTool(BaseTestGenerator): - """ - Ensures that the call to the backend to start running a query - calls the needed functions - """ +class TestStartQueryTool(BaseTestGenerator): + """StartQueryTool""" @patch('pgadmin.tools.sqleditor.extract_sql_from_network_parameters') - def runTest(self, extract_sql_from_network_parameters_mock): - """Check correct function is called to handle to run query.""" + def test_all(self, extract_sql_from_network_parameters_mock): + """ + When request is sent to the backend + And the request parameters are correct + It starts the execution of the query and return 200 + """ extract_sql_from_network_parameters_mock.return_value = \ 'transformed sql' @@ -39,8 +42,9 @@ class StartQueryTool(BaseTestGenerator): data='"some sql statement"' ) - self.assertEquals(response.status, '200 OK') - self.assertEquals(response.data, b'some result') + response.status | should.be.equal.to('200 OK') + response.data | should.be.equal.to(b'some result') + StartRunningQuery_execute_mock \ .assert_called_with('transformed sql', 1234, ANY, False) extract_sql_from_network_parameters_mock \ diff --git a/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py b/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py index 5d02af2b..9f178522 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py @@ -14,7 +14,7 @@ from flask import Flask, render_template from jinja2 import FileSystemLoader from pgadmin import VersionedTemplateLoader -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.utils.driver import get_driver from config import PG_DEFAULT_DRIVER try: diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py index 6a96220f..e1ecdebc 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py @@ -11,7 +11,7 @@ import sys from pgadmin.tools.sqleditor.utils import apply_explain_plan_wrapper_if_needed -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import patch, MagicMock diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py index 97479782..4a32798d 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py @@ -10,7 +10,7 @@ """Apply Explain plan wrapper to sql object.""" from pgadmin.utils.ajax import make_json_response, internal_server_error from pgadmin.tools.sqleditor.utils.filter_dialog import FilterDialog -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator TX_ID_ERROR_MSG = 'Transaction ID not found in the session.' FAILED_TX_MSG = 'Failed to update the data on server.' diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py b/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py index 7cab0678..a361d33f 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_query_tool_fs_utils.py @@ -7,7 +7,7 @@ # ########################################################################## import os -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.tools.sqleditor.utils.query_tool_fs_utils import \ read_file_generator diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py index 4ad0891a..4f3689b9 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py @@ -13,7 +13,7 @@ import simplejson as json from pgadmin.tools.sqleditor.utils.start_running_query import StartRunningQuery from pgadmin.utils.exception import ConnectionLost -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator if sys.version_info < (3, 3): from mock import patch, MagicMock diff --git a/web/pgadmin/utils/base_test_generator.py b/web/pgadmin/utils/base_test_generator.py new file mode 100644 index 00000000..78f7f784 --- /dev/null +++ b/web/pgadmin/utils/base_test_generator.py @@ -0,0 +1,29 @@ +import pytest +import six + +from pgadmin.utils import server_utils +from pgadmin.utils.route import TestsGeneratorRegistry + + +@six.add_metaclass(TestsGeneratorRegistry) +class BaseTestGenerator(object): + @pytest.fixture(autouse=True) + def the_real_setup(self, context_of_tests): + if hasattr(self, 'setup_not_needed'): + return + + self.server_information = context_of_tests['server_information'] + self.tester = context_of_tests['test_client'] + self.server = context_of_tests['server'] + + self.server_id = self.server_information["server_id"] + server_con = server_utils.connect_server(self, self.server_id) + if hasattr(self, 'skip_on_database'): + if 'data' in server_con and 'type' in server_con['data']: + if server_con['data']['type'] in self.skip_on_database: + self.skipTest('cannot run in: %s' % + server_con['data']['type']) + + def _expand_test_object(self, kwargs): + for key in kwargs.keys(): + setattr(self, key, kwargs[key]) diff --git a/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py b/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py index 7030703f..03b4d5b9 100644 --- a/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py +++ b/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py @@ -9,7 +9,7 @@ import sys -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from pgadmin.utils.javascript.javascript_bundler import JavascriptBundler from pgadmin.utils.javascript.javascript_bundler import JsState diff --git a/web/pgadmin/utils/route.py b/web/pgadmin/utils/route.py index f784e534..b51d2f62 100644 --- a/web/pgadmin/utils/route.py +++ b/web/pgadmin/utils/route.py @@ -9,17 +9,10 @@ import sys import traceback -from abc import ABCMeta, abstractmethod +from abc import ABCMeta from importlib import import_module -import six from werkzeug.utils import find_modules -from pgadmin.utils import server_utils - -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest class TestsGeneratorRegistry(ABCMeta): @@ -77,41 +70,3 @@ class TestsGeneratorRegistry(ABCMeta): traceback.print_exc(file=sys.stderr) -@six.add_metaclass(TestsGeneratorRegistry) -class BaseTestGenerator(unittest.TestCase): - # Defining abstract method which will override by individual testcase. - - def setUp(self): - super(BaseTestGenerator, self).setUp() - self.server_id = self.server_information["server_id"] - server_con = server_utils.connect_server(self, self.server_id) - if hasattr(self, 'skip_on_database'): - if 'data' in server_con and 'type' in server_con['data']: - if server_con['data']['type'] in self.skip_on_database: - self.skipTest('cannot run in: %s' % - server_con['data']['type']) - - @classmethod - def setTestServer(cls, server): - cls.server = server - - @abstractmethod - def runTest(self): - pass - - # Initializing app. - def setApp(self, app): - self.app = app - - # Initializing test_client. - @classmethod - def setTestClient(cls, test_client): - cls.tester = test_client - - @classmethod - def setDriver(cls, driver): - cls.driver = driver - - @classmethod - def setServerInformation(cls, server_information): - cls.server_information = server_information diff --git a/web/pgadmin/utils/tests/test_compile_template_name.py b/web/pgadmin/utils/tests/test_compile_template_name.py index d6ee1288..52e93bea 100644 --- a/web/pgadmin/utils/tests/test_compile_template_name.py +++ b/web/pgadmin/utils/tests/test_compile_template_name.py @@ -6,8 +6,11 @@ # This software is released under the PostgreSQL Licence # ########################################################################## + +from grappa import should + from pgadmin.utils.compile_template_name import compile_template_name -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestCompileTemplateName(BaseTestGenerator): @@ -32,8 +35,10 @@ class TestCompileTemplateName(BaseTestGenerator): ), ] - def runTest(self): + def test_all(self, args, kwargs): + self._expand_test_object(kwargs) result = compile_template_name( 'some/prefix', 'some_file.sql', self.server_type, self.version ) - self.assertEquals(result, self.expected_return_value) + result | should.be.equal.to(self.expected_return_value) + diff --git a/web/pgadmin/utils/tests/test_versioned_template_loader.py b/web/pgadmin/utils/tests/test_versioned_template_loader.py index 46fefeca..a4739a85 100644 --- a/web/pgadmin/utils/tests/test_versioned_template_loader.py +++ b/web/pgadmin/utils/tests/test_versioned_template_loader.py @@ -9,86 +9,26 @@ import os +import pytest from flask import Flask +from grappa import should from jinja2 import FileSystemLoader from jinja2 import TemplateNotFound from pgadmin import VersionedTemplateLoader -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator class TestVersionedTemplateLoader(BaseTestGenerator): - scenarios = [ - ( - "Render a template when called", - dict(scenario=1) - ), - ( - "Render a version 9.1 template when it is present", - dict(scenario=2) - ), - ( - "Render a version 9.2 template when request for a higher version", - dict(scenario=3) - ), - ( - "Render default version when version 9.0 was requested and only " - "9.1 and 9.2 are present", - dict(scenario=4) - ), - ( - "Raise error when version is smaller than available templates", - dict(scenario=5) - ), - ( - "Render a version GPDB 5.0 template when it is present", - dict(scenario=6) - ), - ( - "Render a version GPDB 5.0 template when it is in default", - dict(scenario=7) - ), - ( - "Raise error when version is gpdb but template does not exist", - dict(scenario=8) - ) - ] + """Test Versioned template loader""" - def setUp(self): + @pytest.fixture(autouse=True) + def setup_tests(self): + setattr(self, 'setup_not_needed', True) self.loader = VersionedTemplateLoader(FakeApp()) - def runTest(self): - if self.scenario == 1: - self.test_get_source_returns_a_template() - if self.scenario == 2: - # test_get_source_when_the_version_is_9_1_returns_9_1_template - self.test_get_source_when_the_version_is_9_1() - if self.scenario == 3: - # test_get_source_when_the_version_is_9_3_and_there_are_templates_ - # for_9_2_and_9_1_returns_9_2_template - self.test_get_source_when_the_version_is_9_3() - if self.scenario == 4: - # test_get_source_when_the_version_is_9_0_and_there_are_templates_ - # for_9_1_and_9_2_returns_default_template - self.test_get_source_when_the_version_is_9_0() - if self.scenario == 5: - # test_raise_not_found_exception_when_postgres_version_less_than_ - # all_available_sql_templates - self.test_raise_not_found_exception() - if self.scenario == 6: - # test_get_source_when_the_version_is_gpdb_5_0_returns_gpdb_5_0_ - # template - self.test_get_source_when_the_version_is_gpdb_5_0() - if self.scenario == 7: - # test_get_source_when_the_version_is_gpdb_5_0_returns_default_ - # template - self.test_get_source_when_the_version_is_gpdb_5_0_returns_default() - if self.scenario == 8: - # test_raise_not_found_exception_when_the_version_is_gpdb_template - # _not_exist - self.test_raise_not_found_exception_when_the_version_is_gpdb() - def test_get_source_returns_a_template(self): + """Render a template when called""" expected_content = "Some SQL" \ "\nsome more stuff on a new line\n" # For cross platform we join the SQL path @@ -99,10 +39,9 @@ class TestVersionedTemplateLoader(BaseTestGenerator): content, filename, up_to_dateness = self.loader.get_source( None, "some_feature/sql/9.1_plus/some_action.sql" ) - self.assertEqual( - expected_content, str(content).replace("\r", "") - ) - self.assertIn(sql_path, filename) + expected_content | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_get_source_when_the_version_is_9_1(self): """Render a version 9.1 template when it is present""" @@ -117,10 +56,9 @@ class TestVersionedTemplateLoader(BaseTestGenerator): None, "some_feature/sql/#90100#/some_action.sql" ) - self.assertEqual( - expected_content, str(content).replace("\r", "") - ) - self.assertIn(sql_path, filename) + expected_content | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_get_source_when_the_version_is_9_3(self): """Render a version 9.2 template when request for a higher version""" @@ -133,10 +71,9 @@ class TestVersionedTemplateLoader(BaseTestGenerator): None, "some_feature/sql/#90300#/some_action.sql" ) - self.assertEqual( - "Some 9.2 SQL", str(content).replace("\r", "") - ) - self.assertIn(sql_path, filename) + "Some 9.2 SQL" | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_get_source_when_the_version_is_9_0(self): """Render default version when version 9.0 was requested and only @@ -150,18 +87,15 @@ class TestVersionedTemplateLoader(BaseTestGenerator): None, "some_feature/sql/#90000#/some_action_with_default.sql") - self.assertEqual("Some default SQL", str(content).replace("\r", "")) - self.assertIn(sql_path, filename) + "Some default SQL" | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_raise_not_found_exception(self): """Raise error when version is smaller than available templates""" - try: - self.loader.get_source( - None, "some_feature/sql/#10100#/some_action.sql" - ) - self.fail("No exception raised") - except TemplateNotFound: - return + (lambda: self.loader.get_source( + None, "some_feature/sql/#10100#/some_action.sql" + )) | should.raises(TemplateNotFound) def test_get_source_when_the_version_is_gpdb_5_0(self): """Render a version GPDB 5.0 template when it is present""" @@ -177,10 +111,9 @@ class TestVersionedTemplateLoader(BaseTestGenerator): "some_feature/sql/#gpdb#80323#/some_action_with_gpdb_5_0.sql" ) - self.assertEqual( - expected_content, str(content).replace("\r", "") - ) - self.assertIn(sql_path, filename) + expected_content | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_get_source_when_the_version_is_gpdb_5_0_returns_default(self): """Render a version GPDB 5.0 template when it is in default""" @@ -194,20 +127,15 @@ class TestVersionedTemplateLoader(BaseTestGenerator): None, "some_feature/sql/#gpdb#80323#/some_action_with_default.sql" ) - self.assertEqual( - expected_content, str(content).replace("\r", "") - ) - self.assertIn(sql_path, filename) + expected_content | should.be.equal.to(str(content).replace("\r", "")) + + filename | should.contain.item(sql_path) def test_raise_not_found_exception_when_the_version_is_gpdb(self): """"Raise error when version is gpdb but template does not exist""" - try: - self.loader.get_source( - None, "some_feature/sql/#gpdb#50100#/some_action.sql" - ) - self.fail("No exception raised") - except TemplateNotFound: - return + (lambda: self.loader.get_source( + None, "some_feature/sql/#gpdb#50100#/some_action.sql" + )) | should.raises(TemplateNotFound) class FakeApp(Flask): diff --git a/web/regression/conftest.py b/web/regression/conftest.py new file mode 100644 index 00000000..1f66b465 --- /dev/null +++ b/web/regression/conftest.py @@ -0,0 +1,35 @@ +# +# pgAdmin 4 - PostgreSQL Tools +# +# Copyright (C) 2013 - 2018, The pgAdmin Development Team +# This software is released under the PostgreSQL Licence +# + +# def pytest_generate_tests(metafunc): +# print('\n\n\npytest_generate_tests\n\n\n') +# idlist = [] +# argvalues = [] +# for scenario in metafunc.cls.scenarios: +# idlist.append(scenario[0]) +# items = scenario[1].items() +# argnames = [x[0] for x in items] +# argvalues.append(([x[1] for x in items])) +# metafunc.parametrize(argnames, argvalues, ids=idlist, scope="class") +import sys + + +def pytest_generate_tests(metafunc): + print('Generation next') + idlist = [] + argvalues = [] + argnames = [] + print('output', file=sys.stderr) + for scenario in metafunc.cls.scenarios: + idlist.append(scenario[0]) + items = scenario[1].items() + argnames = [x[0] for x in items] + argvalues.append(([x[1] for x in items])) + print('bamm', file=sys.stderr) + print('shebang', file=sys.stderr) + metafunc.parametrize(argnames, argvalues, ids=idlist, scope="class", + indirect=False) diff --git a/web/regression/feature_utils/base_feature_test.py b/web/regression/feature_utils/base_feature_test.py index 568fc2e9..3fcb94bf 100644 --- a/web/regression/feature_utils/base_feature_test.py +++ b/web/regression/feature_utils/base_feature_test.py @@ -16,7 +16,7 @@ from datetime import datetime from copy import deepcopy import config as app_config -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.feature_utils.pgadmin_page import PgadminPage diff --git a/web/regression/python_test_utils/sql_template_test_base.py b/web/regression/python_test_utils/sql_template_test_base.py index e0521786..383d7962 100644 --- a/web/regression/python_test_utils/sql_template_test_base.py +++ b/web/regression/python_test_utils/sql_template_test_base.py @@ -7,7 +7,7 @@ # ########################################################################## -from pgadmin.utils.route import BaseTestGenerator +from pgadmin.utils.base_test_generator import BaseTestGenerator from regression.python_test_utils import test_utils from pgadmin.utils.driver import DriverRegistry diff --git a/web/regression/requirements.txt b/web/regression/requirements.txt index 41343a9f..7258410b 100644 --- a/web/regression/requirements.txt +++ b/web/regression/requirements.txt @@ -8,10 +8,13 @@ ########################################### pycodestyle==2.3.1 pyperclip~=1.6.0 +pytest==3.5.1 testscenarios==0.5.0 testtools==2.3.0 traceback2==1.4.0 unittest2==1.1.0 +grappa==0.1.8 +pytest-json==0.4.0 ################################################################ # Modules specifically requires for Python2.7 or greater version diff --git a/web/regression/runtests.sh b/web/regression/runtests.sh new file mode 100755 index 00000000..b4701d3b --- /dev/null +++ b/web/regression/runtests.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +web_dir=$(cd `dirname $0` && cd .. && pwd ) +export PYTHONPATH=$web_dir +pytest $web_dir/pgadmin --json=test_result.json --resultlog=regression.log