From e08b2f92180d0fb496ed3fd8ce015c1a0493944b Mon Sep 17 00:00:00 2001 From: Cyril Jouve Date: Fri, 28 Aug 2020 18:15:52 +0200 Subject: [PATCH 1/7] Replaces deprecated unittest method names with the correct ones. --- .../servers/databases/casts/tests/utils.py | 4 ++-- .../tests/test_event_trigger_add.py | 2 +- .../tests/test_event_trigger_delete.py | 2 +- .../tests/test_event_trigger_delete_multiple.py | 2 +- .../test_event_trigger_dependancy_dependent.py | 2 +- .../tests/test_event_trigger_functions.py | 2 +- .../tests/test_event_trigger_get.py | 4 ++-- .../tests/test_event_trigger_put.py | 2 +- .../tests/test_event_trigger_sql.py | 2 +- .../extensions/tests/test_extension_add.py | 2 +- .../extensions/tests/test_extension_delete.py | 2 +- .../tests/test_extension_delete_multiple.py | 2 +- .../extensions/tests/test_extension_get.py | 2 +- .../extensions/tests/test_extension_put.py | 2 +- .../tests/test_external_tables_module.py | 4 ++-- .../tests/test_external_tables_view.py | 4 ++-- .../tests/test_foreign_servers_add.py | 2 +- .../tests/test_foreign_servers_delete.py | 2 +- .../test_foreign_servers_delete_multiple.py | 2 +- .../test_foreign_servers_dependent_dependency.py | 2 +- .../tests/test_foreign_servers_get.py | 2 +- .../tests/test_foreign_servers_msql.py | 2 +- .../tests/test_foreign_servers_node.py | 2 +- .../tests/test_foreign_servers_put.py | 2 +- .../tests/test_foreign_servers_sql.py | 2 +- .../user_mappings/tests/test_user_mapping_add.py | 2 +- .../tests/test_user_mapping_delete.py | 2 +- .../tests/test_user_mapping_delete_multiple.py | 2 +- .../test_user_mapping_dependent_dependency.py | 2 +- .../user_mappings/tests/test_user_mapping_get.py | 2 +- .../tests/test_user_mapping_msql.py | 2 +- .../tests/test_user_mapping_node.py | 2 +- .../user_mappings/tests/test_user_mapping_put.py | 2 +- .../user_mappings/tests/test_user_mapping_sql.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_add.py | 2 +- .../tests/test_fdw_delete.py | 2 +- .../tests/test_fdw_delete_multiple.py | 2 +- .../tests/test_fdw_dependency_dependent.py | 2 +- .../tests/test_fdw_get-handlers.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_get.py | 2 +- .../tests/test_fdw_get_nodes.py | 2 +- .../tests/test_fdw_get_validators.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_msql.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_put.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_sql.py | 2 +- .../languages/tests/test_language_add.py | 2 +- .../languages/tests/test_language_delete.py | 2 +- .../tests/test_language_delete_multiple.py | 2 +- .../languages/tests/test_language_dependency.py | 2 +- .../languages/tests/test_language_dependent.py | 2 +- .../languages/tests/test_language_get.py | 4 ++-- .../test_language_get_function_and_template.py | 2 +- .../languages/tests/test_language_put.py | 2 +- .../languages/tests/test_language_sql.py | 2 +- .../collations/tests/test_collation_add.py | 2 +- .../collations/tests/test_collation_delete.py | 2 +- .../tests/test_collation_delete_multiple.py | 2 +- .../tests/test_collation_dependency_dependent.py | 2 +- .../collations/tests/test_collation_get.py | 2 +- .../test_collation_get_collation_function.py | 2 +- .../collations/tests/test_collation_get_nodes.py | 2 +- .../collations/tests/test_collation_put.py | 2 +- .../collations/tests/test_collation_sql.py | 2 +- .../tests/test_domain_constraints_add.py | 2 +- .../tests/test_domain_constraints_delete.py | 2 +- .../test_domain_constraints_delete_multiple.py | 2 +- .../tests/test_domain_constraints_dependents.py | 2 +- .../tests/test_domain_constraints_get.py | 2 +- .../tests/test_domain_constraints_msql.py | 2 +- .../tests/test_domain_constraints_node.py | 2 +- .../tests/test_domain_constraints_put.py | 2 +- .../tests/test_domain_constraints_sql.py | 2 +- .../schemas/domains/tests/test_domain_add.py | 2 +- .../schemas/domains/tests/test_domain_delete.py | 2 +- .../domains/tests/test_domain_delete_multiple.py | 2 +- .../tests/test_domain_dependent_dependency.py | 2 +- .../schemas/domains/tests/test_domain_get.py | 2 +- .../domains/tests/test_domain_get_collations.py | 2 +- .../domains/tests/test_domain_get_node.py | 2 +- .../domains/tests/test_domain_get_types_func.py | 2 +- .../schemas/domains/tests/test_domain_msql.py | 2 +- .../schemas/domains/tests/test_domain_put.py | 2 +- .../schemas/domains/tests/test_domain_sql.py | 8 ++++---- .../tests/test_foreign_table_add.py | 2 +- .../tests/test_foreign_table_delete.py | 2 +- .../tests/test_foreign_table_delete_multiple.py | 2 +- .../tests/test_foreign_table_get.py | 2 +- .../tests/test_foreign_table_put.py | 2 +- .../tests/test_fts_configuration_add.py | 2 +- .../tests/test_fts_configuration_copyConfig.py | 2 +- .../tests/test_fts_configuration_delete.py | 4 ++-- .../test_fts_configuration_delete_multiple.py | 2 +- ...est_fts_configuration_dependency_dependent.py | 2 +- .../tests/test_fts_configuration_get.py | 2 +- .../test_fts_configuration_get_dictionaries.py | 2 +- .../tests/test_fts_configuration_get_nodes.py | 2 +- .../tests/test_fts_configuration_get_sql.py | 2 +- .../tests/test_fts_configuration_parsers.py | 2 +- .../tests/test_fts_configuration_put.py | 8 ++++---- .../tests/test_fts_configuration_tokens.py | 2 +- .../tests/test_fts_dictionaries_add.py | 2 +- .../tests/test_fts_dictionaries_delete.py | 4 ++-- .../test_fts_dictionaries_delete_multiple.py | 2 +- ...test_fts_dictionaries_dependency_dependent.py | 2 +- .../test_fts_dictionaries_fetch_templates.py | 2 +- .../tests/test_fts_dictionaries_get.py | 2 +- .../tests/test_fts_dictionaries_get_nodes.py | 2 +- .../tests/test_fts_dictionaries_put.py | 4 ++-- .../fts_parsers/tests/test_fts_parser_add.py | 2 +- .../fts_parsers/tests/test_fts_parser_delete.py | 4 ++-- .../tests/test_fts_parser_delete_multiple.py | 2 +- .../test_fts_parser_dependency_dependent.py | 2 +- .../tests/test_fts_parser_end_functions.py | 2 +- .../fts_parsers/tests/test_fts_parser_get.py | 2 +- .../tests/test_fts_parser_get_nodes.py | 2 +- .../tests/test_fts_parser_head_line_functions.py | 2 +- .../tests/test_fts_parser_lextype_functions.py | 2 +- .../fts_parsers/tests/test_fts_parser_put.py | 2 +- .../tests/test_fts_parser_start_functions.py | 2 +- .../tests/test_fts_parser_token_functions.py | 2 +- .../test_fts_template_dependency_dependent.py | 2 +- .../tests/test_fts_template_get_init.py | 2 +- .../tests/test_fts_template_get_lexize.py | 2 +- .../tests/test_fts_template_get_nodes.py | 2 +- .../tests/test_fts_templates_add.py | 2 +- .../tests/test_fts_templates_delete.py | 4 ++-- .../tests/test_fts_templates_delete_multiple.py | 2 +- .../tests/test_fts_templates_get.py | 2 +- .../tests/test_fts_templates_put.py | 4 ++-- .../schemas/functions/tests/test_function_add.py | 2 +- .../functions/tests/test_function_delete.py | 2 +- .../tests/test_function_delete_multiple.py | 2 +- .../schemas/functions/tests/test_function_get.py | 2 +- .../schemas/functions/tests/test_function_put.py | 2 +- .../functions/tests/test_procedure_add.py | 2 +- .../functions/tests/test_procedure_delete.py | 2 +- .../tests/test_procedure_delete_multiple.py | 2 +- .../functions/tests/test_procedure_exec_sql.py | 4 ++-- .../functions/tests/test_procedure_get.py | 2 +- .../functions/tests/test_procedure_put.py | 2 +- .../functions/tests/test_trigger_func_add.py | 2 +- .../functions/tests/test_trigger_func_delete.py | 2 +- .../tests/test_trigger_func_delete_multiple.py | 2 +- .../functions/tests/test_trigger_func_get.py | 2 +- .../functions/tests/test_trigger_func_put.py | 2 +- .../edbfuncs/tests/test_package_edbfuncs_get.py | 14 +++++++------- .../schemas/packages/tests/test_package_add.py | 2 +- .../packages/tests/test_package_delete.py | 2 +- .../tests/test_package_delete_multiple.py | 2 +- .../schemas/packages/tests/test_package_get.py | 2 +- .../schemas/packages/tests/test_package_put.py | 2 +- .../schemas/sequences/tests/test_sequence_add.py | 2 +- .../sequences/tests/test_sequence_delete.py | 2 +- .../tests/test_sequence_delete_multiple.py | 2 +- .../schemas/sequences/tests/test_sequence_get.py | 2 +- .../schemas/sequences/tests/test_sequence_put.py | 2 +- .../schemas/synonyms/tests/test_synonym_add.py | 2 +- .../synonyms/tests/test_synonym_delete.py | 2 +- .../tests/test_synonym_delete_multiple.py | 2 +- .../schemas/synonyms/tests/test_synonym_get.py | 2 +- .../schemas/synonyms/tests/test_synonym_put.py | 2 +- .../tables/columns/tests/test_column_msql.py | 2 +- .../tests/test_compound_triggers_add.py | 2 +- .../tests/test_compound_triggers_delete.py | 2 +- .../test_compound_triggers_delete_multiple.py | 2 +- .../tests/test_compound_triggers_get.py | 4 ++-- .../tests/test_compound_triggers_put.py | 2 +- .../schemas/tables/indexes/tests/utils.py | 4 ++-- .../row_security_policies/tests/test_rls_add.py | 2 +- .../tests/test_rls_delete.py | 2 +- .../tests/test_rls_delete_multiple.py | 2 +- .../row_security_policies/tests/test_rls_get.py | 2 +- .../row_security_policies/tests/test_rls_put.py | 2 +- .../schemas/tables/rules/tests/test_rules_add.py | 2 +- .../tables/rules/tests/test_rules_delete.py | 2 +- .../rules/tests/test_rules_delete_multiple.py | 2 +- .../schemas/tables/rules/tests/test_rules_get.py | 2 +- .../schemas/tables/rules/tests/test_rules_put.py | 2 +- .../tables/tests/test_column_privileges_put.py | 2 +- .../schemas/tables/tests/test_table_add.py | 2 +- .../schemas/tables/tests/test_table_delete.py | 2 +- .../tables/tests/test_table_delete_multiple.py | 2 +- .../schemas/tables/tests/test_table_get.py | 2 +- .../tables/tests/test_table_parameters.py | 2 +- .../schemas/tables/tests/test_table_put.py | 2 +- .../tables/triggers/tests/test_triggers_add.py | 2 +- .../triggers/tests/test_triggers_delete.py | 2 +- .../tests/test_triggers_delete_multiple.py | 2 +- .../tables/triggers/tests/test_triggers_get.py | 4 ++-- .../tables/triggers/tests/test_triggers_put.py | 2 +- .../databases/schemas/tests/test_schema_add.py | 2 +- .../schemas/tests/test_schema_delete.py | 2 +- .../schemas/tests/test_schema_delete_multiple.py | 2 +- .../schemas/tests/test_schema_dependents.py | 2 +- .../databases/schemas/tests/test_schema_get.py | 2 +- .../schemas/tests/test_schema_get_children.py | 2 +- .../databases/schemas/tests/test_schema_node.py | 2 +- .../databases/schemas/tests/test_schema_put.py | 2 +- .../databases/schemas/tests/test_schema_sql.py | 2 +- .../schemas/types/tests/test_types_add.py | 2 +- .../schemas/types/tests/test_types_delete.py | 2 +- .../types/tests/test_types_delete_multiple.py | 2 +- .../tests/test_types_dependency_dependent.py | 2 +- .../schemas/types/tests/test_types_get.py | 2 +- .../types/tests/test_types_get_collations.py | 2 +- .../tests/test_types_get_external_functions.py | 2 +- .../schemas/types/tests/test_types_get_stypes.py | 2 +- .../types/tests/test_types_get_stypes_opclass.py | 2 +- .../types/tests/test_types_get_subtype_diff.py | 2 +- .../schemas/types/tests/test_types_get_types.py | 2 +- .../schemas/types/tests/test_types_msql.py | 2 +- .../schemas/types/tests/test_types_nodes.py | 2 +- .../schemas/types/tests/test_types_put.py | 2 +- .../schemas/types/tests/test_types_sql.py | 2 +- .../views/tests/test_mviews_parameters.py | 2 +- .../schemas/views/tests/test_mviews_refresh.py | 6 +++--- .../schemas/views/tests/test_views_add.py | 2 +- .../schemas/views/tests/test_views_delete.py | 2 +- .../views/tests/test_views_delete_multiple.py | 2 +- .../schemas/views/tests/test_views_get.py | 2 +- .../schemas/views/tests/test_views_put.py | 2 +- .../servers/databases/tests/test_db_add.py | 2 +- .../servers/databases/tests/test_db_delete.py | 2 +- .../databases/tests/test_db_delete_multiple.py | 2 +- .../servers/databases/tests/test_db_get.py | 2 +- .../servers/databases/tests/test_db_put.py | 2 +- .../servers/pgagent/tests/test_pgagent_add.py | 2 +- .../servers/pgagent/tests/test_pgagent_delete.py | 2 +- .../tests/test_pgagent_delete_multiple.py | 2 +- .../servers/pgagent/tests/test_pgagent_put.py | 2 +- .../pgagent/tests/tests_pgagent_add_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_add_steps.py | 2 +- .../tests_pgagent_delete_multiple_schedules.py | 2 +- .../tests/tests_pgagent_delete_multiple_steps.py | 2 +- .../tests/tests_pgagent_delete_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_delete_steps.py | 2 +- .../servers/pgagent/tests/tests_pgagent_get.py | 2 +- .../pgagent/tests/tests_pgagent_put_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_put_step.py | 2 +- .../servers/pgagent/tests/tests_pgagent_stats.py | 2 +- .../tests/test_resource_groups_add.py | 2 +- .../tests/test_resource_groups_delete.py | 2 +- .../test_resource_groups_delete_multiple.py | 2 +- .../tests/test_resource_groups_put.py | 2 +- .../tests/tests_resource_groups_get.py | 2 +- .../servers/roles/tests/test_role_add.py | 2 +- .../servers/roles/tests/test_role_delete.py | 2 +- .../roles/tests/test_role_delete_multiple.py | 2 +- .../servers/roles/tests/test_role_get.py | 2 +- .../servers/roles/tests/test_role_put.py | 2 +- .../tablespaces/tests/test_backend_supported.py | 2 +- .../servers/tablespaces/tests/test_tbspc_add.py | 2 +- .../tablespaces/tests/test_tbspc_delete.py | 4 ++-- .../servers/tablespaces/tests/test_tbspc_get.py | 2 +- .../servers/tablespaces/tests/test_tbspc_put.py | 2 +- .../test_add_server_with_connect_timeout.py | 2 +- .../tests/test_add_server_with_service_id.py | 2 +- .../tests/test_add_server_with_ssh_tunnel.py | 2 +- .../servers/tests/test_check_ssl_connection.py | 2 +- .../servers/tests/test_is_valid_address.py | 2 +- .../servers/tests/test_server_add.py | 6 +++--- .../servers/tests/test_server_delete.py | 2 +- .../servers/tests/test_server_get.py | 2 +- .../servers/tests/test_server_put.py | 2 +- .../browser/tests/test_change_password.py | 4 ++-- .../browser/tests/test_master_password.py | 14 +++++++------- .../dashboard/tests/test_dashboard_graphs.py | 6 +++--- .../pg_utilities_backup_restore_test.py | 4 ++-- .../pg_utilities_maintenance_test.py | 6 +++--- .../feature_tests/view_data_dml_queries.py | 4 ++-- .../test_check_utility_exists_route_backup.py | 4 ++-- .../tests/test_grant_wizard_get_acl.py | 2 +- .../tests/test_grant_wizard_get_properties.py | 2 +- .../tests/test_grant_wizard_get_sql.py | 2 +- .../tests/test_grant_wizard_save_permissions.py | 2 +- ...t_check_utility_exists_route_import_export.py | 4 ++-- ...est_check_utility_exists_route_maintenance.py | 4 ++-- .../test_check_utility_exists_route_restore.py | 4 ++-- .../schema_diff/tests/test_schema_diff_comp.py | 8 ++++---- .../search_objects/tests/test_api_search.py | 4 ++-- .../tools/search_objects/tests/test_api_types.py | 4 ++-- .../tests/test_search_objects_helper.py | 10 +++++----- .../tests/test_download_csv_query_tool.py | 12 ++++++------ .../tools/sqleditor/tests/test_editor_history.py | 14 +++++++------- .../sqleditor/tests/test_encoding_charset.py | 10 +++++----- .../tools/sqleditor/tests/test_explain_plan.py | 10 +++++----- .../test_extract_sql_from_network_parameters.py | 2 +- .../sqleditor/tests/test_poll_query_tool.py | 8 ++++---- .../sqleditor/tests/test_start_query_tool.py | 4 ++-- .../sqleditor/tests/test_transaction_status.py | 14 +++++++------- .../tools/sqleditor/tests/test_view_data.py | 10 +++++----- .../tests/test_apply_explain_plan_wrapper.py | 2 +- .../utils/tests/test_filter_dialog_callbacks.py | 4 ++-- .../tests/test_is_query_resultset_updatable.py | 12 ++++++------ .../utils/tests/test_save_changed_data.py | 10 +++++----- .../utils/tests/test_start_running_query.py | 4 ++-- .../utils/tests/test_compile_template_name.py | 2 +- web/pgadmin/utils/tests/test_encoding.py | 2 +- web/regression/python_test_utils/test_utils.py | 4 ++-- web/regression/re_sql/tests/test_resql.py | 16 ++++++++-------- 300 files changed, 410 insertions(+), 410 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py index 68f9da2cb..c332a327d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py @@ -121,13 +121,13 @@ def get_database_connection(self): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response): act_res = response.json["errormsg"] exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_cast_created(self): 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 4ffca944a..2f152b7fe 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 @@ -122,7 +122,7 @@ class EventTriggerAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database 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 bca67dccc..031a1b725 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 @@ -115,7 +115,7 @@ class EventTriggerDeleteTestCase(BaseTestGenerator): response = self.delete_event_trigger() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py index b0e3e4eca..23e64e7c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py @@ -113,7 +113,7 @@ class EventTriggerMultipleDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py index dd9a9284e..3abf1c2eb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py @@ -86,7 +86,7 @@ class EventTriggerDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py index c4fc0572c..526469669 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py @@ -104,7 +104,7 @@ class EventTriggerFunctionsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 880f3144e..7e49d19f2 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 @@ -123,7 +123,7 @@ class EventTriggerGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database @@ -228,7 +228,7 @@ class EventTriggerGetNodesAndNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 08b5d93a2..941e51e9e 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 @@ -115,7 +115,7 @@ class EventTriggerPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py index 0b050c844..5cd75a0b0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py @@ -122,7 +122,7 @@ class EventTriggerGetSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 af62ca486..6325b2442 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 @@ -46,7 +46,7 @@ class ExtensionsAddTestCase(BaseTestGenerator): self.db_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added extension. 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 87639b539..f88e258cb 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 @@ -52,7 +52,7 @@ class ExtensionsDeleteTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.extension_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database. """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py index a52a8d675..633385137 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py @@ -66,7 +66,7 @@ class ExtensionsDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database. """ 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 23efe5889..a7d37a7b7 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 @@ -48,7 +48,7 @@ class ExtensionsGetTestCase(BaseTestGenerator): self.server_id) + '/' + str(self.db_id) + '/' + str(self.extension_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added 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 a25870c2f..5b451e59b 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 @@ -60,7 +60,7 @@ class ExtensionsPutTestCase(BaseTestGenerator): '/' + str(self.extension_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added 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 56e0ae636..498972290 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 @@ -78,7 +78,7 @@ class TestExternalTablesModule(BaseTestGenerator): manager.sversion = self.manager['sversion'] manager.server_type = self.manager['server_type'] module = ExternalTablesModule('something') - self.assertEquals( + self.assertEqual( self.expected_result, module.backend_supported(manager) ) @@ -96,6 +96,6 @@ class TestExternalTablesModule(BaseTestGenerator): def __test_template_javascript(self): module = ExternalTablesModule('something') - self.assertEquals( + self.assertEqual( self.expected_result, module.module_use_template_javascript) 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 d474b441d..1306dd3b5 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 @@ -340,8 +340,8 @@ class TestExternalTablesView(BaseTestGenerator): self.manager.connection.assert_called_with( **self.expected_manager_connection_to_be_called_with ) - self.assertEquals(self.manager, external_tables_view.manager) - self.assertEquals(self.connection, external_tables_view.connection) + self.assertEqual(self.manager, external_tables_view.manager) + self.assertEqual(self.connection, external_tables_view.connection) @patch('pgadmin.browser.server_groups.servers.databases.external_tables' '.render_template') 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 3ec9a76f1..f7d96dbed 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 @@ -101,7 +101,7 @@ class ForeignServerAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added foreign 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 a7ab075d8..c558f2387 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 @@ -87,7 +87,7 @@ class ForeignServerDeleteTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py index fe91d8c20..50a4a6027 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py @@ -90,7 +90,7 @@ class ForeignServerDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py index 383d4bef1..5bd53c70d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py @@ -79,7 +79,7 @@ class ForeignServerDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 2e897bc96..5e2b2047d 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 @@ -104,7 +104,7 @@ class ForeignServerGetTestCase(BaseTestGenerator): actual_response_code = fsrv_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py index 024b7d093..78bb2c3ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py @@ -81,7 +81,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py index 186bf4dc7..6badd2503 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py @@ -90,7 +90,7 @@ class ForeignServerGetNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 23c2ec814..aa4f04907 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 @@ -91,7 +91,7 @@ class ForeignServerPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py index 07f5dc47f..fc567c71e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py @@ -92,7 +92,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py index 9cf6e2d1c..626c62e7c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py @@ -109,7 +109,7 @@ class UserMappingAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py index 2dea5ade7..c4e264931 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py @@ -105,7 +105,7 @@ class UserMappingDeleteTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py index 3bf23a4f0..d21e73daf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py @@ -90,7 +90,7 @@ class UserMappingDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py index f09c09d34..d0dbf8f2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py @@ -88,7 +88,7 @@ class UserMappingDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py index e555fcd03..94ec72435 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py @@ -115,7 +115,7 @@ class UserMappingGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py index ff1ee59c5..6078c0f3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py @@ -90,7 +90,7 @@ class UserMappingGetMSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py index 4d9f830eb..dfb7130a7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py @@ -98,7 +98,7 @@ class UserMappingNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py index 22e5ee239..5330191ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py @@ -100,7 +100,7 @@ class UserMappingPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py index 5b43e47b0..9d4bebf19 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py @@ -101,7 +101,7 @@ class UserMappingGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added 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 a6d0acc0f..bdef897f2 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 @@ -76,7 +76,7 @@ class FDWDAddTestCase(BaseTestGenerator): del self.data['name'] response = self.create_foreign_data_wrapper() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 e3a0a86f2..c4344c6da 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 @@ -82,7 +82,7 @@ class FDWDeleteTestCase(BaseTestGenerator): self.fdw_id = 99999 response = self.delete_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py index 9080209f1..c8752eccf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py @@ -73,7 +73,7 @@ class FDWDDeleteMultipleTestCase(BaseTestGenerator): data = {'ids': self.fdw_ids} delete_response = self.delete_multiple(data) - self.assertEquals(delete_response.status_code, + self.assertEqual(delete_response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py index 070549ea8..50f2c6cd7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py @@ -67,7 +67,7 @@ class FDWDependencyAndDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py index ba0659444..4679373d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py @@ -72,7 +72,7 @@ class FDWHandlersTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_handlers_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 22272cf46..4496b0c2e 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 @@ -90,7 +90,7 @@ class FDWDGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the FDW and disconnect the test database """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py index b95596351..c366c9e8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py @@ -95,7 +95,7 @@ class FDWDNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py index a61e28b23..f10ba0dc0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py @@ -71,7 +71,7 @@ class FDWValidatorsTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_validators_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py index cee903777..9411bd95f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py @@ -64,7 +64,7 @@ class FDWDGetMSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it 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 e89a86f1b..080cfd868 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 @@ -74,7 +74,7 @@ class FDWDPutTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): put_response = self.update_fdw() - self.assertEquals(put_response.status_code, + self.assertEqual(put_response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py index 67392fde9..afeb819df 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py @@ -74,7 +74,7 @@ class FDWDGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it 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 d823ed6b4..6f3bf1344 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 @@ -72,7 +72,7 @@ class LanguagesAddTestCase(BaseTestGenerator): response = self.create_language() actual_status_code = response.status_code expected_status_code = self.expected_data["status_code"] - self.assertEquals(actual_status_code, expected_status_code) + self.assertEqual(actual_status_code, expected_status_code) def create_language(self): """This function will add language under test database.""" 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 36839b79c..c878b7cfa 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 @@ -63,7 +63,7 @@ class LanguagesDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def delete_language(self): """This function will delete language under test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py index 1bc308703..ab9dc56ad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py @@ -57,7 +57,7 @@ class LanguagesDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py index 543b0f008..ea46a1078 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py @@ -45,7 +45,7 @@ class LanguagesGetDependencyTestCase(BaseTestGenerator): response = self.get_language_dependency() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_dependency(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py index cfcb64b23..fa3600db7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py @@ -44,7 +44,7 @@ class LanguagesGetDependentTestCase(BaseTestGenerator): response = self.get_language_dependency() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_dependency(self): """ 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 334674687..39c3a4e92 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 @@ -84,7 +84,7 @@ class LanguagesGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_properties(self): return self.tester.get("{0}{1}/{2}/{3}/{4}".format( @@ -147,7 +147,7 @@ class LanguagesGetNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_nodes(self): return self.tester.get("{0}{1}/{2}/{3}/".format( diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py index 4526d908e..6b06a7bbb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py @@ -51,7 +51,7 @@ class LanguagesGetFunctionAndTemplateTestCase(BaseTestGenerator): response = self.get_language_functions_template() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_functions_template(self): """ 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 2d45304e2..3a5a3eba1 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 @@ -56,7 +56,7 @@ class LanguagesPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def update_language(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py index 77caf71e0..99a512921 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py @@ -56,7 +56,7 @@ class LanguagesGetSql(BaseTestGenerator): response = self.get_language_sql() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_sql(self): """ 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 925e3517c..4f960fa8f 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 @@ -103,7 +103,7 @@ class CollationAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 2eb41d920..b31ca339b 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 @@ -89,7 +89,7 @@ class CollationDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py index 610159654..a79d4e3a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py @@ -83,7 +83,7 @@ class CollationDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py index cd6c6f482..ba518a306 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py @@ -70,7 +70,7 @@ class CollationDependentsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 9cb0aaf36..7a57f8d9a 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 @@ -98,7 +98,7 @@ class CollationGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py index 612be34cb..ecd419c9d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py @@ -78,7 +78,7 @@ class CollationGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data["status_code"] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py index ac890ce8c..087e4fc86 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py @@ -91,7 +91,7 @@ class CollationNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 d21c0b0bf..cc3c73654 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 @@ -94,7 +94,7 @@ class CollationPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py index ee5b301bc..66689cac9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py @@ -89,7 +89,7 @@ class CollationSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py index 358ab74d1..1941d7a11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py @@ -97,7 +97,7 @@ class DomainConstraintAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py index 53bbe6550..92ab39924 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py @@ -106,7 +106,7 @@ class DomainConstraintDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py index f4da799c2..745e0b95c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py @@ -108,7 +108,7 @@ class DomainConstraintDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py index 89d5812e8..e82f39ffd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py @@ -100,7 +100,7 @@ class DomainConstraintDependentAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py index 7c455a9ad..be2609c90 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py @@ -128,7 +128,7 @@ class DomainConstraintGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py index 5daa2621e..1cef1e3a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py @@ -107,7 +107,7 @@ class DomainConstraintMsqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py index c6462135d..9000a0717 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py @@ -132,7 +132,7 @@ class DomainConstraintNodeAndNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py index d5ff4891a..07fabbaaf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py @@ -109,7 +109,7 @@ class DomainConstraintPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py index d48ab04be..3e708977b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py @@ -111,7 +111,7 @@ class DomainConstraintGetSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 979500cfb..2b1f73270 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 @@ -84,7 +84,7 @@ class DomainAddTestCase(BaseTestGenerator): expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database 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 eed0c6eef..c34edd91a 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 @@ -83,7 +83,7 @@ class DomainDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py index 6ff6ec18f..35b1bc704 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py @@ -80,7 +80,7 @@ class DomainDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = get_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py index c15386d54..f23c87fb2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py @@ -70,7 +70,7 @@ class DomainGetDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 25c9d5d1e..0a301e259 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 @@ -98,7 +98,7 @@ class DomainGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py index d4f580210..7857ca780 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py @@ -76,7 +76,7 @@ class DomainGetCollationsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py index b11f91705..1034f14ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py @@ -86,7 +86,7 @@ class DomainGetNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py index 8c4fa016d..b6c73181d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py @@ -82,7 +82,7 @@ class DomainGetTypesTestCase(BaseTestGenerator): expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py index 16972ae30..e8e217f59 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py @@ -74,7 +74,7 @@ class DomainMsqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 aafd0ba45..e0cbcc16e 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 @@ -92,7 +92,7 @@ class DomainPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py index ffe4a11dc..0c96644d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py @@ -95,7 +95,7 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, expected_response_code) + self.assertEqual(get_response.status_code, expected_response_code) orig_sql = json.loads(get_response.data.decode('utf-8')) # Replace multiple spaces with one space and check the expected sql @@ -108,7 +108,7 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): self.test_data['domain_sql'], self.server["username"]) - self.assertEquals(sql, expected_sql) + self.assertEqual(sql, expected_sql) domain_utils.delete_domain(self.server, db_name, @@ -129,14 +129,14 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, + self.assertEqual(get_response.status_code, expected_response_code) if hasattr(self, "wrong_domain_id"): self.domain_id = 99999 get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, + self.assertEqual(get_response.status_code, expected_response_code) def tearDown(self): 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 6a01b547d..67ea5cd1c 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 @@ -96,7 +96,7 @@ class ForeignTableAddTestCase(BaseTestGenerator): str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 43641a54e..dd51aa970 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 @@ -86,7 +86,7 @@ class ForeignTableDeleteTestCase(BaseTestGenerator): str(self.ft_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """ This function disconnect the test database. """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py index 73e18afe9..432cec063 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py @@ -90,7 +90,7 @@ class ForeignTableDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data)) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """ This function disconnect the test database. """ 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 d8c20e9c0..623950cc5 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 @@ -81,7 +81,7 @@ class ForeignTableGetTestCase(BaseTestGenerator): str(self.ft_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 ae6752c73..99f9552f7 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 @@ -95,7 +95,7 @@ class ForeignTablePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 24647349a..79d4c1e3b 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 @@ -80,7 +80,7 @@ class FTSConfiguraionAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py index 3f2609001..1dce50fd3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py @@ -108,7 +108,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 0aeedd355..f7e4fa0f7 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 @@ -75,7 +75,7 @@ class FTSConfDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.fts_conf_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -84,7 +84,7 @@ class FTSConfDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py index 4facacc35..43b4209f7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py @@ -79,7 +79,7 @@ class FTSConfDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data), content_type='html/json') - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py index 2be915a85..5ff52007c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py @@ -92,7 +92,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ 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 21eeb9bc9..9e5effead 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 @@ -71,7 +71,7 @@ class FTSConfGetTestCase(BaseTestGenerator): str(self.fts_conf_id), content_type='html/json') - self.assertEquals(get_response.status_code, 200) + self.assertEqual(get_response.status_code, 200) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py index 391e4efbe..1c2ef1f58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py @@ -109,7 +109,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py index e81865e0d..a74744dce 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py @@ -129,7 +129,7 @@ class FTSConfigurationNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py index 20aca7cf2..b59286468 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py @@ -111,7 +111,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py index 86bb8ef24..f9e90ba6a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py @@ -108,7 +108,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 3b97a1a55..76d4cecbc 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 @@ -87,7 +87,7 @@ class FTSConfPutTestCase(BaseTestGenerator): str(self.fts_conf_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -97,7 +97,7 @@ class FTSConfPutTestCase(BaseTestGenerator): str(0), data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts_config and disconnect the test @@ -187,7 +187,7 @@ class FTSConfDictPutTestCase(BaseTestGenerator): str(self.fts_conf_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # check again whether dictionary is schema qualified get_response = self.tester.get( @@ -200,7 +200,7 @@ class FTSConfDictPutTestCase(BaseTestGenerator): response_data = json.loads(get_response.data) res_dictname = response_data["tokens"][0]["dictname"] - self.assertEquals(dictname, res_dictname[0]) + self.assertEqual(dictname, res_dictname[0]) def tearDown(self): """This function delete the fts_config and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py index cf13c134f..a973b82c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py @@ -110,7 +110,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 504817b49..c7b36dd2b 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 @@ -75,7 +75,7 @@ class FtsDictionaryAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts dictionaries and disconnect the test 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 60dd87b51..f85c939c7 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 @@ -78,7 +78,7 @@ class FtsDictionaryDeleteTestCase(BaseTestGenerator): str(self.fts_dict_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -88,7 +88,7 @@ class FtsDictionaryDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py index c87b10f90..9bb243a39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py @@ -94,7 +94,7 @@ class FtsDictionaryDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py index 0b2dea079..a65faa58e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py @@ -92,7 +92,7 @@ class FTSDictionariesDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py index 2f19db086..598495306 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py @@ -109,7 +109,7 @@ class FTSDictionariesDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_dict and disconnect the test 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 ea32d2260..9d55b18a5 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 @@ -69,7 +69,7 @@ class FtsDictionaryGetTestCase(BaseTestGenerator): str(self.fts_dict_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts dictionaries and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py index afa06bf91..43a3cb78e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py @@ -129,7 +129,7 @@ class FTSDictionariesNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_dict and disconnect the test 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 0fe1aa840..d593d1b9f 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 @@ -86,7 +86,7 @@ class FtsDictionaryPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -97,7 +97,7 @@ class FtsDictionaryPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts dictionaries and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py index f99faf342..2187a3a79 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py @@ -71,7 +71,7 @@ class FtsParserAddTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py index 18448b871..8aae4a518 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py @@ -76,7 +76,7 @@ class FtsParserDeleteTestCase(BaseTestGenerator): str(self.fts_parser_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -86,7 +86,7 @@ class FtsParserDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py index 735f63bbe..23682c134 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py @@ -94,7 +94,7 @@ class FtsParserDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py index 546db4601..3b58c2ccf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py @@ -92,7 +92,7 @@ class FTSParsersDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py index 508ab8762..f9be61e05 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py @@ -110,7 +110,7 @@ class FTSParsersEndFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py index 89738aaa1..a73c498b8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py @@ -67,7 +67,7 @@ class FtsParserGetTestCase(BaseTestGenerator): str(self.fts_parser_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py index 35d101d4d..87d5df6db 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py @@ -129,7 +129,7 @@ class FTSParsersNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py index e3bb75531..35e60da63 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py @@ -110,7 +110,7 @@ class FTSParsersNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py index 3ca2233c8..3e77cce58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py @@ -110,7 +110,7 @@ class FTSParsersLexTypeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py index 0f0ea3c2a..1c777bad6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py @@ -85,7 +85,7 @@ class FtsParserPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py index f8447efa8..a61c154fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py @@ -110,7 +110,7 @@ class FTSParsersEndFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py index e27f42150..2e43dd155 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py @@ -110,7 +110,7 @@ class FTSParsersTokenFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py index 85da79723..0df58fcee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py @@ -92,7 +92,7 @@ class FTSTemplatesDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py index 45a7cab26..3ace9f3bc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py @@ -100,7 +100,7 @@ class FTSTemplatesGetInitTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_init(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py index c4c1a7434..da2b3d44e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py @@ -100,7 +100,7 @@ class FTSTemplatesGetLexizeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_lexzie(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py index 2cb7412a4..63dccebe7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py @@ -105,7 +105,7 @@ class FTSTemplatesDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_fts_templates_nodes(self): """ 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 050a48db9..e3ce269e5 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 @@ -72,7 +72,7 @@ class FtsTemplateAddTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_template and disconnect the test 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 b49c27327..0a7811a38 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 @@ -75,7 +75,7 @@ class FtsTemplateDeleteTestCase(BaseTestGenerator): str(self.fts_temp_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -85,7 +85,7 @@ class FtsTemplateDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py index e09569a68..d4aef6248 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py @@ -92,7 +92,7 @@ class FtsTemplateDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 e49beba5b..a0bcf093b 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 @@ -69,7 +69,7 @@ class FtsTemplateGetTestCase(BaseTestGenerator): str(self.fts_temp_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_template and disconnect the test 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 7434a6a02..517c5a17c 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 @@ -84,7 +84,7 @@ class FtsTemplatePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -95,7 +95,7 @@ class FtsTemplatePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts_template and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py index 9a1063d52..2eb6139e3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py @@ -90,6 +90,6 @@ class FunctionAddTestCase(BaseTestGenerator): content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py index 6dd6bf806..4244aaab0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py @@ -41,7 +41,7 @@ class FunctionDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(func_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py index d822e4e21..a0c0f93d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py @@ -48,7 +48,7 @@ class FunctionDeleteTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py index a44a22f81..17ba1159c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py @@ -41,7 +41,7 @@ class FunctionGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py index 4ca810e26..1db46a313 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py @@ -60,7 +60,7 @@ class FunctionPutTestCase(BaseTestGenerator): str(func_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py index c3940f566..7496b52ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py @@ -88,6 +88,6 @@ class ProcedureAddTestCase(BaseTestGenerator): content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py index cc6c189ee..aa7e40b44 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py @@ -48,7 +48,7 @@ class procedureDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(proc_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py index 0402a0dbc..31b0f3956 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py @@ -56,7 +56,7 @@ class procedureDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py index a9b4eb0a8..d1f478f66 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py @@ -54,7 +54,7 @@ class ProcedureExecSQLTestCase(BaseTestGenerator): '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(proc_id)) - self.assertEquals(exec_response.status_code, 200) + self.assertEqual(exec_response.status_code, 200) exec_sql = json.loads(exec_response.data.decode('utf-8')) # Replace multiple spaces with one space and check the expected sql @@ -68,7 +68,7 @@ class ProcedureExecSQLTestCase(BaseTestGenerator): expected_sql = self.expected_sql.format("EXEC", self.schema_name, proc_name) - self.assertEquals(sql, expected_sql) + self.assertEqual(sql, expected_sql) # Verify the EXEC SQL by running it if we don't have arguments if not self.with_args: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py index 678346878..9ba1e4a5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py @@ -47,7 +47,7 @@ class ProcedureGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(proc_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py index 9c17a8795..aceb01853 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py @@ -54,7 +54,7 @@ class ProcedurePutTestCase(BaseTestGenerator): str(proc_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) 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 c90453d2b..3cba56ba5 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 @@ -86,6 +86,6 @@ class TriggerFuncAddTestCase(BaseTestGenerator): '/', data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) 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 261488dfb..4e04c71e5 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 @@ -43,7 +43,7 @@ class TriggerFuncDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py index d6d1cd037..cc379c3f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py @@ -51,7 +51,7 @@ class TriggerFuncDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) 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 30cca310f..aaaae5cab 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 @@ -42,7 +42,7 @@ class TriggerFuncGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) 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 7bbe3c2d9..94d466c61 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 @@ -50,7 +50,7 @@ class TriggerFuncPutTestCase(BaseTestGenerator): str(trigger_func_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py index 11fb61903..b5ae914cd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py @@ -111,11 +111,11 @@ END %s;""" % (self.schema_name, self.pkg_name, self.proc_name, response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response.status_code, 200) - self.assertEquals(len(response_data['data']), 1) - self.assertEquals(response_data['data'][0]['label'], + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response_data['data']), 1) + self.assertEqual(response_data['data'][0]['label'], self.func_name + '()') - self.assertEquals(response_data['data'][0]['_type'], 'edbfunc') + self.assertEqual(response_data['data'][0]['_type'], 'edbfunc') # Fetch Package procedure url = self.url.format('edbproc') + str( @@ -127,11 +127,11 @@ END %s;""" % (self.schema_name, self.pkg_name, self.proc_name, response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response.status_code, 200) - self.assertEquals(len(response_data['data']), 1) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response_data['data']), 1) self.assertIn(self.proc_name, response_data['data'][0]['label']) self.assertIn("INOUT", response_data['data'][0]['label']) - self.assertEquals(response_data['data'][0]['_type'], 'edbproc') + self.assertEqual(response_data['data'][0]['_type'], 'edbproc') def tearDown(self): """This function disconnect the test database.""" 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 2e55c29a3..1fde69ed7 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 @@ -83,7 +83,7 @@ class PackageAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 9df1c2b4a..ba5e382ca 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 @@ -86,7 +86,7 @@ class PackageDeleteTestCase(BaseTestGenerator): str(self.package_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py index de0ccdaca..43f59340c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py @@ -92,7 +92,7 @@ class PackageDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 27ba4d89b..9185bf829 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 @@ -79,7 +79,7 @@ class PackageGetTestCase(BaseTestGenerator): str(self.package_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 831bf944c..8cc9dac29 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 @@ -92,7 +92,7 @@ class PackagePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 7c1e8aaac..6745c72f3 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 @@ -119,7 +119,7 @@ class SequenceAddTestCase(BaseTestGenerator): '/' + str(schema_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 294bc4d63..45e12c534 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 @@ -62,7 +62,7 @@ class SequenceDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.sequence_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py index f5cadd8d5..e04f07659 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py @@ -86,7 +86,7 @@ class SequenceDeleteMultipleTestCase(BaseTestGenerator): data=data, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 9120a8900..23832eb63 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 @@ -57,7 +57,7 @@ class SequenceGetTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.sequence_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 1eeedd106..8b76d90a9 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 @@ -91,7 +91,7 @@ class SequencePutTestCase(BaseTestGenerator): str(self.sequence_id), data=json.dumps(self.data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 986435bec..6be14cb72 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 @@ -77,7 +77,7 @@ class SynonymAddTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 bad95bf50..89e7f7248 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 @@ -79,7 +79,7 @@ class SynonymDeleteTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.syn_oid), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py index 361f54713..60a689898 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py @@ -96,7 +96,7 @@ class SynonymDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 6681f1e6d..41d5c3932 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 @@ -73,7 +73,7 @@ class SynonymGetTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.syn_oid), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ Disconnect the database. """ 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 b9faa7087..97eaf087b 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 @@ -99,7 +99,7 @@ class SynonymPutTestCase(BaseTestGenerator): str(self.syn_oid), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ Disconnect the database. """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py index fa8e68464..5f0e6b3d1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py @@ -102,7 +102,7 @@ class ColumnMsqlTestCase(BaseTestGenerator): expected_precision = self.data["old_precision"] expected_sql = (eval(self.expected_data["test_result_data"])) - self.assertEquals(response_data['data'], expected_sql) + self.assertEqual(response_data['data'], expected_sql) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py index cce634d5d..a574eacd9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py @@ -116,7 +116,7 @@ class CompoundTriggersAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_compound_trigger(object_id) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py index 6f25444c4..7ce060f02 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py @@ -102,7 +102,7 @@ class CompoundTriggersDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py index 062456f2f..95f1dcf98 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py @@ -110,7 +110,7 @@ class CompoundTriggersDeleteMultipleTestCase(BaseTestGenerator): if self.is_positive_test: response = self.delete_multiple_compound_triggers(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py index be389dcdd..1448a456f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py @@ -110,7 +110,7 @@ class CompoundTriggersGetTestCase(BaseTestGenerator): url + \ "?oid=17312&description=commaa&name=code&_=1589522392579" response = self.tester.get(url, follow_redirects=True) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) if hasattr(self, "table_nodes"): self.trigger_id = '' @@ -137,7 +137,7 @@ class CompoundTriggersGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py index 349856b11..dee22c090 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py @@ -135,7 +135,7 @@ class CompoundTriggersUpdateTestCase(BaseTestGenerator): self.trigger_id = 9999 response = self.update_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py index 87f46b88a..2932bcf35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py @@ -146,7 +146,7 @@ def api_get_index_msql(self): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response, error_msg=None): @@ -155,7 +155,7 @@ def assert_error_message(self, response, error_msg=None): exp_res = error_msg else: exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def create_index(server, db_name, schema_name, table_name, index_name, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py index 6e64377b4..36e517d6e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py @@ -83,7 +83,7 @@ class RulesAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_policy(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def create_policy(self, data): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py index 7639f97ed..9ac2627ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py @@ -79,7 +79,7 @@ class PolicyDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_policy() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py index d8d76ff6f..74ed682c6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py @@ -86,7 +86,7 @@ class PolicyDeleteTestCases(BaseTestGenerator): data = {'ids': self.rule_ids} if self.is_positive_test: response = self.delete_multiple_policy(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py index 09eb613f5..21ebc1202 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py @@ -86,7 +86,7 @@ class PolicyGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_policy() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py index 2e6c6d97c..7f140d475 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py @@ -97,7 +97,7 @@ class PolicyUpdateTestCase(BaseTestGenerator): self.policy_id = 9999 response = self.update_policy(self.test_data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 51a816762..92b0474bd 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 @@ -75,7 +75,7 @@ class RulesAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def create_rule(self, data): 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 aee667bd8..1395ac69a 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 @@ -79,7 +79,7 @@ class RulesDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_rules() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py index f23a101a8..97f543161 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py @@ -86,7 +86,7 @@ class RulesDeleteTestCase(BaseTestGenerator): data = {'ids': self.rule_ids} if self.is_positive_test: response = self.delete_multiple_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 37aa62cba..73136ba83 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 @@ -86,7 +86,7 @@ class RulesGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_rule() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 f90658418..824aebbae 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 @@ -85,7 +85,7 @@ class RulesUpdateTestCase(BaseTestGenerator): self.rule_id = 9999 response = self.update_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py index 2a26a61ce..a4323c32d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py @@ -89,7 +89,7 @@ class TableUpdateColumnTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 f0656e523..fb17fd805 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 @@ -247,7 +247,7 @@ class TableAddTestCase(BaseTestGenerator): '/' + str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 9ebdcac1b..62471253c 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 @@ -59,7 +59,7 @@ class TableDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.table_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py index f3adfb155..76baec78f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py @@ -73,7 +73,7 @@ class TableDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 14a80cd76..b6506cee6 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 @@ -55,7 +55,7 @@ class TableGetTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.table_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py index fae094bdc..8c8694934 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py @@ -168,7 +168,7 @@ class TableUpdateParameterTestCase(BaseTestGenerator): str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 0ef9e62e8..358c5f6f5 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 @@ -156,7 +156,7 @@ class TableUpdateTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 ba52726f1..a2c84ac17 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 @@ -92,7 +92,7 @@ class TriggersAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 0186ae206..1bc8d387f 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 @@ -90,7 +90,7 @@ class TriggersDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py index 135421660..729cc8480 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py @@ -95,7 +95,7 @@ class TriggersDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 25e1eff4f..f5fa5dee8 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 @@ -92,7 +92,7 @@ class TriggersGetTestCase(BaseTestGenerator): "?oid=17312&description=commaa&name=code&_=1589522392579" response = self.tester.get(url, follow_redirects=True) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) if hasattr(self, "table_nodes"): self.trigger_id = '' @@ -119,7 +119,7 @@ class TriggersGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 995a3fc55..44199d925 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 @@ -112,7 +112,7 @@ class TriggersUpdateTestCase(BaseTestGenerator): self.trigger_id = 9999 response = self.update_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 bf55c3797..37ca1b47f 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 @@ -95,7 +95,7 @@ class SchemaAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 5f1f8b77d..e419aa378 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 @@ -79,7 +79,7 @@ class SchemaDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py index e8fc84dd3..bea75a0ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py @@ -81,7 +81,7 @@ class SchemaDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py index f40ed994a..1052407dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py @@ -70,7 +70,7 @@ class SchemaDependentAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 2ae44b9ef..f21e7906d 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 @@ -80,7 +80,7 @@ class SchemaGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py index b4d20b523..06cfa7061 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py @@ -77,7 +77,7 @@ class SchemaChildrenTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py index 650d0f0a0..dcd263907 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py @@ -79,7 +79,7 @@ class SchemaNodeAndNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 ed2385cc7..30a6562aa 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 @@ -151,7 +151,7 @@ class SchemaPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py index d73556810..a75eb031d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py @@ -81,7 +81,7 @@ class SchemaSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 7b7c8c2d8..988f1e550 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 @@ -80,7 +80,7 @@ class TypesAddTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.create_types() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 9b55e6abb..fcb8db2c9 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 @@ -86,7 +86,7 @@ class TypesDeleteTestCase(BaseTestGenerator): self.type_id = 99999 response = self.delete_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py index a16ddbc31..60a50f5e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py @@ -81,7 +81,7 @@ class TypesDeleteMultipleTestCase(BaseTestGenerator): if self.is_positive_test: response = self.delete_multiple(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py index 4b02d8a0d..fa5897f52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py @@ -61,7 +61,7 @@ class TypesDependenciesTestCase(BaseTestGenerator): ) expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database 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 391684996..ed2a4843f 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 @@ -99,7 +99,7 @@ class TypesGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py index ddd2639ff..6492f92a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py @@ -75,7 +75,7 @@ class TypesGetCollationsTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_collations() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py index 29313fb28..635ed9afa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py @@ -77,7 +77,7 @@ class TypesExternalFunctionTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_external_function() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py index 4b570873b..6c0b0fc5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py @@ -76,7 +76,7 @@ class TypesSubTypesTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_subtypes() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py index bdfaa4ed4..73c92f466 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py @@ -68,7 +68,7 @@ class TypesSubTypesOpClassTestCase(BaseTestGenerator): if self.is_positive_test: response = self.get_subtypes_opclass() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py index ad17cd436..73461a8d3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py @@ -68,7 +68,7 @@ class TypesSubTypeDiffTestCase(BaseTestGenerator): if self.is_positive_test: response = self.get_subtype_diff() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py index be4da66b4..57bd736cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py @@ -76,7 +76,7 @@ class TypesGetTypesTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_types() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py index f91a9f101..bbfcbd2fa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py @@ -68,7 +68,7 @@ class TypesMSQLTestCase(BaseTestGenerator): if self.is_positive_test: response = self.msql_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py index 6c7c998a3..5ffee5c5e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py @@ -95,7 +95,7 @@ class TypesNodesTestCase(BaseTestGenerator): self.type_id = 99999 response = self.get_type_node() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 449653be0..cd708876d 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 @@ -79,7 +79,7 @@ class TypesUpdateTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.update_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py index 8af9e2c5a..2d78eeb35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py @@ -80,7 +80,7 @@ class TypesSQLTestCase(BaseTestGenerator): self.type_id = 99999 response = self.sql_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py index 9f9a3898d..47a3c6ed7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py @@ -181,7 +181,7 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): str(self.m_view_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py index 3b4055f30..f54a47a5f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py @@ -115,7 +115,7 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): str(self.m_view_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) if is_put_request and response.json['success'] == 0: self.skipTest( "Couldn't check materialized view refresh" @@ -136,9 +136,9 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): follow_redirects=True ) if self.type == 'invalid': - self.assertEquals(response.status_code, 410) + self.assertEqual(response.status_code, 410) else: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # On success we get job_id from server self.assertTrue('job_id' in response.json['data']) 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 af911d4e9..a582c6076 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 @@ -96,7 +96,7 @@ class ViewsAddTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 bcc22c8f8..7b6ff7a81 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 @@ -80,7 +80,7 @@ class ViewsDeleteTestCase(BaseTestGenerator): ), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py index 6a22a7157..4c33b0a7a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py @@ -97,7 +97,7 @@ class ViewsDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 71279127b..5f5d7a991 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 @@ -76,7 +76,7 @@ class ViewsGetTestCase(BaseTestGenerator): ), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 f99a7972d..5a68040b6 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 @@ -84,7 +84,7 @@ class ViewsUpdateTestCase(BaseTestGenerator): ), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 fc62bed38..a8f92e5da 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 @@ -40,7 +40,7 @@ class DatabaseAddTestCase(BaseTestGenerator): "/" + str(self.server_id) + "/", data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) db_id = response_data['node']['_id'] db_dict = {"server_id": self.server_id, "db_id": db_id, 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 22225b968..cda78b74c 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 @@ -39,7 +39,7 @@ class DatabaseDeleteTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(db_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to server to delete the " "database.") diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py index 51e477603..bf14e757e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py @@ -44,7 +44,7 @@ class DatabaseMultipleDeleteTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to server to delete the " "database.") 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 dd314154e..8f8d3c63e 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 @@ -37,7 +37,7 @@ class DatabasesGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str( server_id) + '/' + str(db_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to database.") except Exception as exception: 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 0a40d79fb..bbf0f8afd 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 @@ -49,7 +49,7 @@ class DatabasesUpdateTestCase(BaseTestGenerator): self.server_id) + '/' + str(self.db_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as exception: from traceback import print_exc print_exc() 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 8c19506f4..57d27a611 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 @@ -76,7 +76,7 @@ class PgAgentAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.job_id = response_data['node']['_id'] 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 4e7ef9a80..53a564479 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 @@ -38,7 +38,7 @@ class PgAgentDeleteTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_job(self) self.assertFalse( is_present, "pgAgent job was not deleted successfully" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py index 89b1f6dc4..9d4c6de85 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py @@ -41,7 +41,7 @@ class PgAgentDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.job_id1, self.job_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" 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 dc55dda39..1054acc4a 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 @@ -113,7 +113,7 @@ class PgAgentPutTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py index ab8da587e..607a9d99a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py @@ -66,7 +66,7 @@ class PgAgentAddScheduleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.schedule_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py index e0f3dfdac..c56696601 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py @@ -55,7 +55,7 @@ class PgAgentAddStepTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.step_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py index 5398fe96a..8cf106ff7 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py @@ -49,7 +49,7 @@ class PgAgentDeleteMultipleSchedulesTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.schedule_id1, self.schedule_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py index 3290557e7..a1486a41a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py @@ -47,7 +47,7 @@ class PgAgentDeleteMultipleStepsTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.step_id1, self.step_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py index e08ea49ab..dbbc16105 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py @@ -41,7 +41,7 @@ class PgAgentDeleteScheduleTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_schedule(self) self.assertFalse( is_present, "pgAgent schedule was not deleted successfully" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py index 9ca26268e..20cb83552 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py @@ -41,7 +41,7 @@ class PgAgentDeleteStepTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_step(self) self.assertFalse( is_present, "pgAgent step was not deleted successfully" 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 99ec4b267..e0af5c548 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 @@ -38,7 +38,7 @@ class PgAgentGetTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py index 0e189b6f9..49d460ab7 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py @@ -123,7 +123,7 @@ class PgAgentPutScheduleTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py index f01d23bf3..09921af93 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py @@ -59,7 +59,7 @@ class PgAgentPutStepTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" 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 5428a1cc1..91a2a2175 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 @@ -38,7 +38,7 @@ class PgAgentStatsTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" 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 913414e8d..e3f8eaffe 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 @@ -50,7 +50,7 @@ class ResourceGroupsAddTestCase(BaseTestGenerator): "/" + str(self.server_id) + "/", data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" 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 8ea87e518..0fa6730da 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 @@ -52,7 +52,7 @@ class ResourceGroupsDeleteTestCase(BaseTestGenerator): "{0}{1}/{2}/{3}".format(self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py index 542593e4c..5b1ae503d 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py @@ -70,7 +70,7 @@ class ResourceGroupsDeleteTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" 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 10c3aa2db..a1241baf1 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 @@ -57,7 +57,7 @@ class ResourceGroupsPutTestCase(BaseTestGenerator): self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" 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 a92a4fc2e..01355bb04 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 @@ -52,7 +52,7 @@ class ResourceGroupsGetTestCase(BaseTestGenerator): "{0}{1}/{2}/{3}".format(self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" 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 0098ff0a3..7a30435e9 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 @@ -41,7 +41,7 @@ class LoginRoleAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) role_id = response_data['node']['_id'] role_dict = {"server_id": server_id, "role_id": role_id, 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 c10856134..7d6f20c15 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 @@ -36,7 +36,7 @@ class LoginRoleDeleteTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.role_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py index 39f6e5ec8..00c3ff726 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py @@ -43,7 +43,7 @@ class LoginRoleDeleteTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" 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 d57d1e6b2..c9316bef7 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 @@ -36,7 +36,7 @@ class LoginRoleGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.role_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" 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 18ad56d0a..03f6e095a 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 @@ -45,7 +45,7 @@ class LoginRolePutTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.role_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the role from added server""" 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 081d57699..e87c9229c 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 @@ -43,6 +43,6 @@ class BackendSupportedTestCase(BaseTestGenerator): manager = MagicMock() manager.sversion = self.manager['sversion'] manager.server_type = self.manager['server_type'] - self.assertEquals( + self.assertEqual( self.expected_result, module.backend_supported(manager) ) 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 378923791..807781aa4 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 @@ -50,7 +50,7 @@ class TableSpaceAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) tablespace_id = response_data['node']['_id'] tablespace_dict = {"tablespace_id": tablespace_id, 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 1b4459171..ee0d4c43b 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 @@ -54,9 +54,9 @@ class TableSpaceDeleteTestCase(BaseTestGenerator): '/' + str(self.server_id) + '/' + str(self.tablespace_id), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) delete_response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(delete_response_data['success'], 1) + self.assertEqual(delete_response_data['success'], 1) def tearDown(self): """This function deletes the tablespace""" 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 f6a7fa407..39922424e 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 @@ -54,7 +54,7 @@ class TablespaceGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.tablespace_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the tablespace from added server""" 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 8c0252689..d1c4bd872 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 @@ -57,7 +57,7 @@ class TableSpaceUpdateTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True ) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function deletes the tablespace""" diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py index cce03041a..94d555617 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py @@ -38,7 +38,7 @@ class ServersWithConnectTimeoutAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] 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 9d8da94fd..9b4d4d377 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 @@ -38,7 +38,7 @@ class ServersWithServiceIDAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py index e8b48c0fc..7c0b005d9 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py @@ -73,7 +73,7 @@ class ServersWithSSHTunnelAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] 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 3f212f37a..785fbd5c7 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 @@ -31,7 +31,7 @@ class TestSSLConnection(BaseTestGenerator): connection.commit() cursor.execute("SELECT ssl_is_used()") is_ssl_used = cursor.fetchone()[0] - self.assertEquals(True, is_ssl_used) + self.assertEqual(True, is_ssl_used) else: self.skipTest( 'Cannot run SSL connection check test ' diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py b/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py index 05dc6da9e..48ce02754 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py @@ -32,7 +32,7 @@ class IsValidAddressTestCase(BaseTestGenerator): pass def runTest(self): - self.assertEquals(utils.is_valid_ipaddress(self.address), + self.assertEqual(utils.is_valid_ipaddress(self.address), self.respdata) @classmethod 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 7fe3cf6a8..8444e1d72 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 @@ -29,7 +29,7 @@ class ServersAddTestCase(BaseTestGenerator): url = "{0}{1}/".format(self.url, utils.SERVER_GROUP) response = self.tester.post(url, data=json.dumps(self.server), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] server_dict = {"server_id": int(self.server_id)} @@ -68,7 +68,7 @@ class AddServersWithSavePasswordTestCase(BaseTestGenerator): response = self.tester.post(url, data=json.dumps(_server), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] server_dict = {"server_id": int(self.server_id)} @@ -77,7 +77,7 @@ class AddServersWithSavePasswordTestCase(BaseTestGenerator): str(utils.SERVER_GROUP) + '/' + str(self.server_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertTrue('is_password_saved' in response.json['result']) utils.write_node_info("sid", server_dict) 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 c2b184295..30917bd3c 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 @@ -32,7 +32,7 @@ class ServerDeleteTestCase(BaseTestGenerator): raise Exception("No server to delete!!!") # Call API to delete the servers response = self.tester.delete(url + str(self.server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the server from SQLite """ 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 9f92ffcce..0b4dc183b 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 @@ -37,7 +37,7 @@ class ServersGetTestCase(BaseTestGenerator): response = self.tester.get(self.url + str(utils.SERVER_GROUP) + '/' + str(server_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the server from SQLite """ 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 8a69558e9..31c7a476e 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 @@ -36,7 +36,7 @@ class ServerUpdateTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id), data=json.dumps(data), content_type='html/json') - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the server from SQLite""" diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index fb86e4dfd..bbc81c685 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -108,7 +108,7 @@ class ChangePasswordTestCase(BaseTestGenerator): # Logout the Administrator before login normal user self.tester.logout() response = self.tester.login(self.username, self.password, True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # test the 'change password' test case utils.change_password(self) # Delete the normal user after changing it's password @@ -119,7 +119,7 @@ class ChangePasswordTestCase(BaseTestGenerator): '/user_management/user/' + str(user_id), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: utils.change_password(self) diff --git a/web/pgadmin/browser/tests/test_master_password.py b/web/pgadmin/browser/tests/test_master_password.py index 5812b4dea..8d9be6326 100644 --- a/web/pgadmin/browser/tests/test_master_password.py +++ b/web/pgadmin/browser/tests/test_master_password.py @@ -73,23 +73,23 @@ class MasterPasswordTestCase(BaseTestGenerator): data=json.dumps(req_data), ) - self.assertEquals(response.json['data']['present'], True) + self.assertEqual(response.json['data']['present'], True) else: if 'reset' in req_data: response = self.tester.delete( '/browser/master_password' ) - self.assertEquals(response.status_code, 200) - self.assertEquals(response.json['data'], False) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json['data'], False) else: response = self.tester.post( '/browser/master_password', data=json.dumps(req_data), ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) if hasattr(self, 'content'): - self.assertEquals(response.json['data']['title'], + self.assertEqual(response.json['data']['title'], self.content[0]) for text in self.content[1]: @@ -99,8 +99,8 @@ class MasterPasswordTestCase(BaseTestGenerator): response = self.tester.get( '/browser/master_password' ) - self.assertEquals(response.status_code, 200) - self.assertEquals(response.json['data'], True) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json['data'], True) def tearDown(self): config.MASTER_PASSWORD_REQUIRED = False diff --git a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py index 0baf02b48..043fcf23c 100644 --- a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py +++ b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py @@ -92,17 +92,17 @@ class DashboardGraphsTestCase(BaseTestGenerator): url = self.getStatsUrl(self.server_id, self.did, ",".join(self.chart_data.keys())) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) resp_data = json.loads(response.data) # All requested charts received - self.assertEquals(len(resp_data.keys()), + self.assertEqual(len(resp_data.keys()), len(self.chart_data.keys())) # All requested charts data received for chart_name, chart_vals in self.chart_data.items(): - self.assertEquals(set(resp_data[chart_name].keys()), + self.assertEqual(set(resp_data[chart_name].keys()), set(chart_vals)) else: diff --git a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py index 797e5bb87..f0fe6db15 100644 --- a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py @@ -91,7 +91,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest): ".loading-logs"), 10) expected_backup_success_msg = "Successfully completed." - self.assertEquals(status, expected_backup_success_msg) + self.assertEqual(status, expected_backup_success_msg) backup_file = None # Check for XSS in Backup details @@ -135,7 +135,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest): self.page.wait_for_element_to_disappear( lambda driver: driver.find_element_by_css_selector( ".loading-logs"), 10) - self.assertEquals(status, expected_backup_success_msg) + self.assertEqual(status, expected_backup_success_msg) # Check for XSS in Restore details if self.is_xss_check: diff --git a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py index 173723a3b..1147b2444 100644 --- a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py @@ -137,14 +137,14 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest): ) if status != "Successfully completed.": - self.assertEquals(status, "Successfully completed.") + self.assertEqual(status, "Successfully completed.") command = self.page.find_by_css_selector( NavMenuLocators. process_watcher_detailed_command_canvas_css).text if self.test_level == 'database': - self.assertEquals(command, "VACUUM (VERBOSE)\nRunning Query:" + self.assertEqual(command, "VACUUM (VERBOSE)\nRunning Query:" "\nVACUUM VERBOSE;") elif self.is_xss_check and self.test_level == 'table': # Check for XSS in the dialog @@ -158,7 +158,7 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest): 'Maintenance detailed window' ) else: - self.assertEquals(command, "VACUUM " + self.assertEqual(command, "VACUUM " "(VERBOSE)\nRunning Query:" "\nVACUUM VERBOSE" " public." + self.table_name + ";") diff --git a/web/pgadmin/feature_tests/view_data_dml_queries.py b/web/pgadmin/feature_tests/view_data_dml_queries.py index 663289fe2..2be43d25e 100644 --- a/web/pgadmin/feature_tests/view_data_dml_queries.py +++ b/web/pgadmin/feature_tests/view_data_dml_queries.py @@ -339,7 +339,7 @@ CREATE TABLE public.nonintpkey def _verify_messsages(self, text): messages_ele = self.page.find_by_css_selector( QueryToolLocators.query_messages_panel) - self.assertEquals(text, messages_ele.text) + self.assertEqual(text, messages_ele.text) def _verify_row_data(self, row_height, config_check_data): self.page.click_execute_query_button() @@ -369,7 +369,7 @@ CREATE TABLE public.nonintpkey print("stale reference exception at id:", idx) retry -= 1 time.sleep(0.4) - self.assertEquals(element.text, config_check_data[str(idx)][1]) + self.assertEqual(element.text, config_check_data[str(idx)][1]) # scroll browser back to the left # to reset position so other assertions can succeed diff --git a/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py b/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py index da71fe16e..b4f6ac183 100644 --- a/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py +++ b/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py @@ -33,6 +33,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py index 249bd3f21..65903fba4 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py @@ -54,7 +54,7 @@ class GrantWizardSaveGetACLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py index 1aa2c2c1b..3b7a7c41a 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py @@ -85,7 +85,7 @@ class GrantWizardSaveGetPropertiesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py index 6cc95b49b..a4aacfd3f 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py @@ -89,7 +89,7 @@ class GrantWizardSaveGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py index 30a785276..27fa831dc 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py @@ -86,7 +86,7 @@ class GrantWizardSavePermissionsTestCase(BaseTestGenerator): response = self.grant_permissions() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py b/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py index d8f3abddf..2895097e2 100644 --- a/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py +++ b/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py b/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py index 4388f5ef4..5fa80a3c2 100644 --- a/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py +++ b/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py b/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py index 6f61df8c2..bb0ef2e44 100644 --- a/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py +++ b/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py index 088829d1e..a856122ac 100644 --- a/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py +++ b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py @@ -109,14 +109,14 @@ class SchemaDiffTestCase(): response = self.tester.get(comp_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) return json.loads(response.data.decode('utf-8')) def runTest(self): """ This function will test the schema diff.""" response = self.tester.get("schema_diff/initialize") - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.trans_id = response_data['data']['schemaDiffTransId'] @@ -162,7 +162,7 @@ class SchemaDiffTestCase(): response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) file_obj.write(response_data['diff_ddl']) elif 'diff_ddl' in diff: @@ -178,7 +178,7 @@ class SchemaDiffTestCase(): response_data = self.compare() for diff in response_data['data']: if diff['type'] in self.nodes: - self.assertEquals(diff['status'], 'Identical') + self.assertEqual(diff['status'], 'Identical') except Exception as e: os.remove(diff_file) diff --git a/web/pgadmin/tools/search_objects/tests/test_api_search.py b/web/pgadmin/tools/search_objects/tests/test_api_search.py index f12e9865e..cf10c997b 100644 --- a/web/pgadmin/tools/search_objects/tests/test_api_search.py +++ b/web/pgadmin/tools/search_objects/tests/test_api_search.py @@ -37,7 +37,7 @@ class SearchObjectsApiSearch(BaseTestGenerator): url_params = urlencode(url_params) response = self.tester.get(self.base_url + '?' + url_params) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def runTest(self): database_info = parent_node_dict["database"][-1] @@ -61,7 +61,7 @@ class SearchObjectsApiSearch(BaseTestGenerator): types_url = '/search_objects/types/' +\ str(server_id) + '/' + str(db_id) response = self.tester.get(types_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) types_data = json.loads(response.data.decode('utf-8'))['data'] for a_type in types_data: diff --git a/web/pgadmin/tools/search_objects/tests/test_api_types.py b/web/pgadmin/tools/search_objects/tests/test_api_types.py index aed5571ad..902456735 100644 --- a/web/pgadmin/tools/search_objects/tests/test_api_types.py +++ b/web/pgadmin/tools/search_objects/tests/test_api_types.py @@ -36,11 +36,11 @@ class SearchObjectsApiTypes(BaseTestGenerator): url = self.url + '/' + str(server_id) + '/' + str(db_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # repsonse data should be dict response_data = json.loads(response.data.decode('utf-8'))['data'] - self.assertEquals(type(response_data), dict) + self.assertEqual(type(response_data), dict) # response data key values should not be None for key, value in response_data.items(): diff --git a/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py b/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py index 810a7f0c5..2b112b573 100644 --- a/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py +++ b/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py @@ -104,17 +104,17 @@ class SearchObjectsHelperTest(BaseTestGenerator): # test template path manager.server_type = 'pg' manager.version = 906000 - self.assertEquals(so_obj.get_template_path(), + self.assertEqual(so_obj.get_template_path(), 'search_objects/sql/pg/#906000#') - self.assertEquals(so_obj.get_show_node_prefs(), + self.assertEqual(so_obj.get_show_node_prefs(), self.expected_show_node_prefs) - self.assertEquals(so_obj.get_supported_types(), + self.assertEqual(so_obj.get_supported_types(), self.expected_supported_types) - self.assertEquals(so_obj.get_supported_types(skip_check=True), + self.assertEqual(so_obj.get_supported_types(skip_check=True), self.expected_supported_types_skip) - self.assertEquals(so_obj.search('searchtext', 'all'), + self.assertEqual(so_obj.search('searchtext', 'all'), self.expected_search_op) diff --git a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py index 812058ec4..37ee5f47e 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py @@ -119,7 +119,7 @@ class TestDownloadCSV(BaseTestGenerator): url = self.init_url.format( self.trans_id, test_utils.SERVER_GROUP, self._sid, self._did) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # If invalid tx test then make the Tx id invalid so that tests fails if not self.is_valid_tx: @@ -137,7 +137,7 @@ class TestDownloadCSV(BaseTestGenerator): response = self.tester.post(url, data={"query": self.sql}) headers = dict(response.headers) # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -149,7 +149,7 @@ class TestDownloadCSV(BaseTestGenerator): response = self.tester.post(url, data={"query": self.sql}) headers = dict(response.headers) # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -167,7 +167,7 @@ class TestDownloadCSV(BaseTestGenerator): self.app.logger.disabled = False if self.is_valid: # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -175,7 +175,7 @@ class TestDownloadCSV(BaseTestGenerator): self.assertIn(self.filename, headers['Content-Disposition']) elif not self.is_valid and self.is_valid_tx: # When user enters wrong query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.assertFalse(response_data['data']['status']) self.assertTrue( @@ -184,7 +184,7 @@ class TestDownloadCSV(BaseTestGenerator): ) else: # when TX id is invalid - self.assertEquals(response.status_code, 500) + self.assertEqual(response.status_code, 500) database_utils.disconnect_database(self, self._sid, self._did) diff --git a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py index 42b28489e..eb17f4521 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py +++ b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py @@ -73,30 +73,30 @@ class TestEditorHistory(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def runTest(self): url = '/sqleditor/query_history/{0}'.format(self.trans_id) if not self.clear: response = self.tester.post(url, data=self.entry) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(len(response_data['data']['result']), + self.assertEqual(len(response_data['data']['result']), self.expected_len) else: response = self.tester.delete(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(len(response_data['data']['result']), + self.assertEqual(len(response_data['data']['result']), self.expected_len) def tearDown(self): diff --git a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py index c70258c05..f734ea1c0 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py +++ b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py @@ -260,21 +260,21 @@ class TestEncodingCharset(BaseTestGenerator): .format(self.trans_id, test_utils.SERVER_GROUP, self.encode_sid, self.encode_did) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check character url = "/sqleditor/query_tool/start/{0}".format(self.trans_id) sql = "select E'{0}';".format(self.test_str) response = self.tester.post(url, data=json.dumps({"sql": sql}), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response_data['data']['rows_fetched_to'], 1) + self.assertEqual(response_data['data']['rows_fetched_to'], 1) result = response_data['data']['result'][0][0] - self.assertEquals(result, self.test_str) + self.assertEqual(result, self.test_str) database_utils.disconnect_database(self, self.encode_sid, self.encode_did) diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py index 8da233938..80ce48bff 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py @@ -37,7 +37,7 @@ class TestExplainPlan(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Start query tool transaction url = '/sqleditor/query_tool/start/{0}'.format(self.trans_id) @@ -55,17 +55,17 @@ class TestExplainPlan(BaseTestGenerator): } }), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Query tool polling url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) # Check the ouput of explain plan - self.assertEquals(len(response_data['data']['result']), 1) - self.assertEquals(len(response_data['data']['result'][0]), 1) + self.assertEqual(len(response_data['data']['result']), 1) + self.assertEqual(len(response_data['data']['result'][0]), 1) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) 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 0d10c94d4..1d9604a19 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 @@ -59,4 +59,4 @@ class ExtractSQLFromNetworkParametersTest(BaseTestGenerator): self.request_form_data ) - self.assertEquals(result, self.expected_result) + self.assertEqual(result, self.expected_result) 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 774fb46df..1f6d89a38 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py @@ -80,7 +80,7 @@ NOTICE: Hello, world! url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) cnt = 0 for s in self.sql: @@ -90,12 +90,12 @@ NOTICE: Hello, world! response = self.tester.post(url, data=json.dumps({"sql": s}), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Query tool polling url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) if self.expected_message[cnt] is not None: @@ -104,7 +104,7 @@ NOTICE: Hello, world! response_data['data']['additional_messages']) # Check the output - self.assertEquals(self.expected_result[cnt], + self.assertEqual(self.expected_result[cnt], response_data['data']['result'][0][0]) cnt += 1 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 0a3af0772..8d3dbb050 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py @@ -34,8 +34,8 @@ class StartQueryTool(BaseTestGenerator): data='"some sql statement"' ) - self.assertEquals(response.status, '200 OK') - self.assertEquals(response.data, b'some result') + self.assertEqual(response.status, '200 OK') + self.assertEqual(response.data, 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_transaction_status.py b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py index 589041acc..b12d94885 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py +++ b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py @@ -246,7 +246,7 @@ class TestTransactionControl(BaseTestGenerator): response = self.tester.post(self.auto_commit_url, data=json.dumps(auto_commit), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _execute_select_sql(self): is_success, _ = \ @@ -254,22 +254,22 @@ class TestTransactionControl(BaseTestGenerator): query=self.select_sql, start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) def _check_transaction_status(self, expected_transaction_status): # Check transaction status response = self.tester.get(self.status_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) transaction_status = response_data['data']['status'] - self.assertEquals(transaction_status, expected_transaction_status) + self.assertEqual(transaction_status, expected_transaction_status) def _save_changed_data(self): response = self.tester.post(self.save_url, data=json.dumps(self.save_payload), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _commit_transaction(self): is_success, _ = \ @@ -277,7 +277,7 @@ class TestTransactionControl(BaseTestGenerator): query='COMMIT;', start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -305,7 +305,7 @@ class TestTransactionControl(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls(self): self.start_query_tool_url = \ diff --git a/web/pgadmin/tools/sqleditor/tests/test_view_data.py b/web/pgadmin/tools/sqleditor/tests/test_view_data.py index c0726ad9b..4a9e14842 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_view_data.py +++ b/web/pgadmin/tools/sqleditor/tests/test_view_data.py @@ -111,20 +111,20 @@ class TestViewData(BaseTestGenerator): else: response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) url = "/sqleditor/view_data/start/{0}".format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check the query result url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response_data['data']['result'], self.result_data) - self.assertEquals(response_data['data']['rows_fetched_to'], + self.assertEqual(response_data['data']['result'], self.result_data) + self.assertEqual(response_data['data']['rows_fetched_to'], self.rows_fetched_to) def tearDown(self): 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 0a7d6214a..0eed7e95f 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 @@ -117,7 +117,7 @@ class StartRunningQueryTest(BaseTestGenerator): render_template_mock.return_value = self.expected_return_value result = apply_explain_plan_wrapper_if_needed( **self.function_input_parameters) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) if self.expect_render_template_mock_parameters: render_template_mock.assert_called_with( self.expect_render_template_mock_parameters[ 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 c72159313..244675b07 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 @@ -91,13 +91,13 @@ class StartRunningDataSortingTest(BaseTestGenerator): ) if self.type == 'get': result = FilterDialog.get(*self.input_parameters) - self.assertEquals( + self.assertEqual( result.status_code, expected_response.status_code ) else: result = FilterDialog.save( *self.input_arg_parameters, **self.input_kwarg_parameters ) - self.assertEquals( + self.assertEqual( result.status_code, expected_response.status_code ) diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py index 6eda4d3cd..279c8736f 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py @@ -156,22 +156,22 @@ class TestQueryUpdatableResultset(BaseTestGenerator): query=sql, poll_url=self.poll_url, start_query_tool_url=self.start_query_tool_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) return response_data def _check_primary_keys(self, response_data): primary_keys = response_data['data']['primary_keys'] - self.assertEquals(primary_keys, self.expected_primary_keys) + self.assertEqual(primary_keys, self.expected_primary_keys) def _check_oids(self, response_data): has_oids = response_data['data']['has_oids'] - self.assertEquals(has_oids, self.expected_has_oids) + self.assertEqual(has_oids, self.expected_has_oids) def _check_editable_columns(self, response_data): columns_info = response_data['data']['colinfo'] for col, expected_is_editable in \ zip(columns_info, self.expected_cols_is_editable): - self.assertEquals(col['is_editable'], expected_is_editable) + self.assertEqual(col['is_editable'], expected_is_editable) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -204,7 +204,7 @@ class TestQueryUpdatableResultset(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls(self): self.start_query_tool_url = \ @@ -265,4 +265,4 @@ class TestTemporaryTable(TestQueryUpdatableResultset): results_column_data = response_data['data']['result'] for result_data, expected_is_editable in \ zip(results_column_data, self.expected_results_column_data): - self.assertEquals(result_data, expected_is_editable) + self.assertEqual(result_data, expected_is_editable) diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py index 8f7cd9dfa..4626800fe 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py @@ -874,7 +874,7 @@ class TestSaveChangedData(BaseTestGenerator): query=query, start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) return response_data def _save_changed_data(self): @@ -883,19 +883,19 @@ class TestSaveChangedData(BaseTestGenerator): data=json.dumps(self.save_payload), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check that the save is successful response_data = json.loads(response.data.decode('utf-8')) save_status = response_data['data']['status'] - self.assertEquals(save_status, self.save_status) + self.assertEqual(save_status, self.save_status) def _check_saved_data(self): check_sql = self.check_sql % self.test_table_name response_data = self._execute_sql_query(check_sql) # Check table for updates result = response_data['data']['result'] - self.assertEquals(result, self.check_result) + self.assertEqual(result, self.check_result) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -922,7 +922,7 @@ class TestSaveChangedData(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls_and_select_sql(self): self.start_query_tool_url = \ 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 32715138d..6e596bb96 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 @@ -497,12 +497,12 @@ class StartRunningQueryTest(BaseTestGenerator): '" excepted but not raised' ) - self.assertEquals(result, expected_response) + self.assertEqual(result, expected_response) except AssertionError: raise except Exception as exception: - self.assertEquals(self.manager_connection_exception, exception) + self.assertEqual(self.manager_connection_exception, exception) self.__mock_assertions(internal_server_error_mock, make_json_response_mock) diff --git a/web/pgadmin/utils/tests/test_compile_template_name.py b/web/pgadmin/utils/tests/test_compile_template_name.py index fbb40053b..5147e4e9a 100644 --- a/web/pgadmin/utils/tests/test_compile_template_name.py +++ b/web/pgadmin/utils/tests/test_compile_template_name.py @@ -36,4 +36,4 @@ class TestCompileTemplateName(BaseTestGenerator): result = compile_template_name( 'some/prefix', 'some_file.sql', self.server_type, self.version ) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) diff --git a/web/pgadmin/utils/tests/test_encoding.py b/web/pgadmin/utils/tests/test_encoding.py index c16c0732c..ef16dd812 100644 --- a/web/pgadmin/utils/tests/test_encoding.py +++ b/web/pgadmin/utils/tests/test_encoding.py @@ -224,4 +224,4 @@ class TestEncoding(BaseTestGenerator): def runTest(self): result = get_encoding(self.db_encoding) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index 3b30b7aad..82bce5029 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -1208,7 +1208,7 @@ def generate_scenarios(key, test_cases): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response, error_msg=None): @@ -1217,7 +1217,7 @@ def assert_error_message(self, response, error_msg=None): exp_res = error_msg else: exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def create_expected_output(parameters, actual_data): diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 05ba712fb..88de458a6 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -268,7 +268,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): data=json.dumps(scenario['data']), content_type='html/json') try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -302,7 +302,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): data=json.dumps(scenario['data']), follow_redirects=True) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -328,7 +328,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): delete_url, data=json.dumps(scenario.get('data', {})), follow_redirects=True) try: - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -395,7 +395,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): response = self.tester.get(url, follow_redirects=True) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -432,7 +432,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): sql = self.preprocess_expected_sql(scenario, sql, resp_sql, object_id) try: - self.assertEquals(sql, resp_sql) + self.assertEqual(sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() @@ -458,7 +458,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): response = self.tester.get(sql_url) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False @@ -487,7 +487,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): sql = self.preprocess_expected_sql(scenario, sql, resp_sql, object_id) try: - self.assertEquals(sql, resp_sql) + self.assertEqual(sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() @@ -504,7 +504,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): exp_sql = self.preprocess_expected_sql(scenario, exp_sql, resp_sql, object_id) try: - self.assertEquals(exp_sql, resp_sql) + self.assertEqual(exp_sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() -- 2.28.0