From 0150fd6965cbe4f6bc501af1d8d458f58822eab4 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 18 May 2026 20:22:07 +0100 Subject: [PATCH] chore(regression): remove dead test_advanced_config + Greenplum config gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two related bits of long-stale plumbing in web/regression/: * test_advanced_config.json.in — the README has told users for years to copy this template to test_advance_config.json (no "d") and customise it, but a repo-wide grep for either spelling shows zero code, test, or CI references. The .in template is dead, and the README/.gitignore also disagree about whether the copied filename has a "d" in it, which is a typo trap that has gone unnoticed precisely because nobody actually performs the copy step. * test_greenplum_config.json — Greenplum support was removed from pgAdmin years ago (only references left in the tree are historical release-notes entries from versions 1.4 through 4.12). Nothing reads the config any more. Drop the dead template, prune both stale lines from web/regression/.gitignore, and simplify the README to describe just the server-side test_config.json that the framework actually consumes. Co-Authored-By: Claude Opus 4.7 (1M context) --- web/regression/.gitignore | 2 - web/regression/README.md | 25 +- web/regression/test_advanced_config.json.in | 492 -------------------- 3 files changed, 8 insertions(+), 511 deletions(-) delete mode 100644 web/regression/test_advanced_config.json.in diff --git a/web/regression/.gitignore b/web/regression/.gitignore index 1edfe2effac..26376a21275 100644 --- a/web/regression/.gitignore +++ b/web/regression/.gitignore @@ -1,7 +1,5 @@ parent_id.pkl regression.log -test_greenplum_config.json -test_advanced_config.json test_config.json test_result.json screenshots/ \ No newline at end of file diff --git a/web/regression/README.md b/web/regression/README.md index 32178728f22..321e0a8f292 100644 --- a/web/regression/README.md +++ b/web/regression/README.md @@ -55,24 +55,21 @@ General Information 3. test_server_get.py 4. test_server_update.py -2) The pgAdmin4 source tree includes 2 different configuration file templates. - One file template for the server configuration - named ‘test_config.json.in' and another for test configuration named - 'test_advanced_config.json.in' in the ‘pgAdmin4/web/regression’ directory. - After completing the pgAdmin4 configuration, you must make a working copy of - the templates called test_config.json and test_advance_config.json - before modifying the file contents. +2) The pgAdmin4 source tree includes a configuration file template for the + server configuration named 'test_config.json.in' in the + 'pgAdmin4/web/regression' directory. After completing the pgAdmin4 + configuration, you must make a working copy of the template called + test_config.json before modifying the file contents. 2a) The following command copies the test_config.json.in file, creating a - configuration file named test_config.json (same way user can copy - test_advance_config.json.in file into test_advance_config.json) + configuration file named test_config.json: $ cp pgadmin4/web/regression/test_config.json.in \ pgadmin4/web/regression/test_config.json - 2b) After creating the server and test configuration file, add (or modify) + 2b) After creating the server configuration file, add (or modify) parameter values as per requirements. The pgAdmin4 regression framework - expects to find the files in the directory + expects to find the file in the directory '//web/regression/'. If you move the file to another location, you must create a symbolic link that specifies the new location. @@ -82,12 +79,6 @@ General Information test_config file is in JSON format and property values are case-sensitive. - 2d) Specifying the Test Configuration file: - - The user can add/change test data as per their need. The - test_advanced_config file is in JSON format and property values are - case-sensitive. - Test Data Details ----------------- diff --git a/web/regression/test_advanced_config.json.in b/web/regression/test_advanced_config.json.in deleted file mode 100644 index 3f8145116c0..00000000000 --- a/web/regression/test_advanced_config.json.in +++ /dev/null @@ -1,492 +0,0 @@ -{ - "add_database_data": - { - "privileges_acl": [ - { - "grantee": "postgres", - "grantor": "postgres", - "privileges": [ - { - "privilege_type": "C", - "privilege": true, - "with_grant": true - }, - { - "privilege_type": "T", - "privilege": true, - "with_grant": false - } - ] - } - ], - "conn_limit": -1, - "owner": "postgres", - "fun_acl": [ - { - "grantee": "postgres", - "grantor": "postgres", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ], - "seq_acl": [ - { - "grantee": "postgres", - "grantor": "postgres", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ], - "tbl_acl": [ - { - "grantee": "postgres", - "grantor": "postgres", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": true - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ], - "type_acl": [ - { - "grantee": "postgres", - "grantor": "postgres", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ], - "encoding": "UTF8", - "name": "test_db_automation", - "privileges": [], - "securities": [], - "variables": [] - }, - "db_update_data": - { - "comment": "This is db update comment" - }, - - "lr_credentials": { - "can_login": "true", - "conn_limit": -1, - "create_role": "true", - "role_inherit": "true", - "role_membership": [], - "lr_name": "testlrg1", - "lr_password": "edb", - "lr_validity": "12/27/2016", - "sec_lable": [], - "variable":[ - {"name":"work_mem", - "database":"postgres", - "value":65 - }] - }, - "lr_update_data": { - "comment": "This is db update comment" - }, - - "tablespc_credentials":[{ - "tblspace_name": "test_tablespace", - "spc_seclable": [], - "spc_acl": [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges":[ - { - "privilege_type":"C", - "privilege":true, - "with_grant":false - } - ] - } - ], - "spc_opts": [], - "spc_user": "postgres" - }], - - "tbspc_update_data": { - "comment": "This is tablespace update comment" - }, - "schema_credentials":[ - { - "func_acl": [], - "seq_acl": [], - "tbl_acl": [], - "type_acl": [], - "name": "test_schema", - "owner": "postgres", - "privilege": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"C", - "privilege":true, - "with_grant":false - }, - { - "privilege_type":"U", - "privilege":true, - "with_grant":false - } - ] - } - ], - "sec_label": [] - }], - "schema_update_data":[ - { - "owner": "postgres", - "tbl_acl": - { - "added": - [ - { - "grantee": "public", - "grantor": "postgres", - "privileges": - [ - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - }, - "func_acl": - { - "added": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"X", - "privilege":true, - "with_grant":true - } - ] - } - ] - }, - "seq_acl": - { - "added": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - }, - { - "privilege_type":"w", - "privilege":true, - "with_grant":false - }, - { - "privilege_type":"U", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - }], - - "trigger_function_credentials":[ - { - "acl": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"X", - "privilege":true, - "with_grant":true - } - ] - } - ], - "args": [], - "fun_owner": "postgres", - "language": "plpgsql", - "name": "test_abort_any_command", - "options": [], - "leak_proof": true, - "namespace": 2200, - "type": "event_trigger/trigger", - "sec_def": true, - "code": "BEGIN RAISE EXCEPTION 'command % is disabled', tg_tag; END;", - "volitile": "s", - "sec_label": [], - "Variable": - [ - { - "name":"enable_sort", - "value":true - } - ] - }], - "trigger_func_update_data": { - "comment": "This is trigger function update comment" - }, - - "collation_credentials":[ - { - "copy_collation": "pg_catalog.\"POSIX\"", - "name": "test_collation", - "owner": "postgres", - "schema": "" - }], - - "collation_update_data": { - "comment": "This is collation update comment" - }, - - "casts_credentials": - [{ - "cast_context": "IMPLICIT", - "encoding": "UTF8", - "name": "money->bigint", - "source_type": "money", - "target_type": "bigint", - "owner": "postgres" - }], - - "cast_update_data": - { - "comment": "This is cast update comment" - }, - - "extension_credentials":[ - { - "name": "postgres_fdw", - "relocate": true, - "schema": "", - "version": "1.0", - "owner": "postgres" - }], - - "extension_update_data": - { - "schema": "schema" - }, - - "fdw_credentials":[ - { - "acl": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"U", - "privilege":true, - "with_grant":true - } - ] - } - ], - "handler": "postgres_fdw_handler", - "options": [], - "owner": "postgres", - "validator": "postgres_fdw_validator", - "name": "fdw" - }], - - "fdw_update_data": - { - "comment": "This is FDW update comment" - }, - - "fsrv_credentials":[ - { - "fsrv_acl": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"U", - "privilege":true, - "with_grant":false - } - ] - } - ], - "fsrv_options": - [ - { - "fsrvoption":"host", - "fsrvvalue":"localhost" - }, - { - "fsrvoption":"port", - "fsrvvalue":"5433" - }, - { - "fsrvoption":"dbname", - "fsrvvalue":"postgres" - } - ], - "owner": "postgres", - "name": "foreign_server1" - }], - - "FSRV_update_data": - { - "comment": "This is foreign server update comment" - }, - - "user_mapping_credentials":[ - { - "name": "postgres", - "option": [], - "owner": "postgres", - "options": - [ - { - "umoption":"user", - "umvalue":"postgres" - }, - { - "umoption":"password", - "umvalue":"edb" - } - ] - }], - - "user_mapping_update_data": - { - "options": - { - "changed": - [ - {"umoption":"password", - "umvalue":"edb1" - } - ] - } - }, - - "event_trigger_credentials": - [{ - "enable": "O", - "event_func": "test_schema.test_abort_any_command", - "event_name": "DDL_COMMAND_END", - "owner": "postgres", - "name": "test_event_trg", - "provider": [] - }], - - "event_trigger_update_data": - { - "comment": "This is event trigger update comment" - }, - - "sequence_credentials": - [{ - "cache": "1", - "cycled": true, - "increment": "1", - "max_value": "100000", - "min_value": "1", - "name": "test_empno", - "acl": - [ - { - "grantee":"postgres", - "grantor":"postgres", - "privileges": - [ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - }, - { - "privilege_type":"w", - "privilege":true, - "with_grant":false - }, - { - "privilege_type":"U", - "privilege":true, - "with_grant":false - } - ] - } - ], - "schema_name": "test_schema", - "security": [], - "owner": "postgres", - "start_val": "100" - }], - - "sequnce_update_data": - { - "comment": "This is sequence update comment" - } - - - }