From 28b637c99c60d33f9b22704f6fff732ed7c4a348 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Thu, 27 Aug 2020 19:08:00 +0530 Subject: [PATCH] Fixed RE-SQL test cases failed due to the previous commit. Introduces a new key - replace_regex_pattern to synchronize the expected SQL with the backend SQL based on the regex string --- .../server_groups/servers/roles/tests/9.4_plus/test.json | 9 ++++++--- web/pgadmin/static/scss/_alertify.overrides.scss | 2 +- web/regression/re_sql/tests/test_resql.py | 6 ++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json index 46eb6cd30..8df404e60 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/9.4_plus/test.json @@ -81,7 +81,8 @@ "expected_sql_file": "alter_role_options2.sql", "expected_msql_file": "alter_role_options2.msql", "convert_timestamp_columns": ["rolvaliduntil"], - "replace_password": true + "replace_password": true, + "replace_regex_pattern": ["VALID UNTIL '[0-9\\-T:+ ]*'"] }, { "type": "alter", @@ -95,7 +96,8 @@ "expected_sql_file": "alter_role_options3.sql", "expected_msql_file": "alter_role_options3.msql", "convert_timestamp_columns": ["rolvaliduntil"], - "replace_password": true + "replace_password": true, + "replace_regex_pattern": ["VALID UNTIL '[0-9\\-T:+ ]*'"] }, { "type": "alter", @@ -112,7 +114,8 @@ "expected_sql_file": "alter_role_options4.sql", "expected_msql_file": "alter_role_options4.msql", "convert_timestamp_columns": ["rolvaliduntil"], - "replace_password": true + "replace_password": true, + "replace_regex_pattern": ["VALID UNTIL '[0-9\\-T:+ ]*'"] }, { "type": "delete", diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss index 28d7d3d93..40f6ac383 100644 --- a/web/pgadmin/static/scss/_alertify.overrides.scss +++ b/web/pgadmin/static/scss/_alertify.overrides.scss @@ -45,7 +45,7 @@ z-index: 5; } } - &.ajs-frameless, + &.ajs-frameless { & .ajs-body { & .ajs-content { diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 85a6aaebc..b670bfacf 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -702,6 +702,12 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): sql = sql.replace(self.JSON_PLACEHOLDERS['password'], password) + if 'replace_regex_pattern' in scenario: + for a_patten in scenario['replace_regex_pattern']: + found = re.findall(a_patten, resp_sql) + if len(found) > 0: + sql = re.sub(a_patten, found[0], sql) + # Replace place holder with the current username # used to connect to the database if 'pga_job_id' in scenario: