Add privacy test suite into default suite list

Summary: Previously, both the nightly runs and the diff sandcastle runs do not include the privacy test suite by default. I found that's caused due to this default test suite. Adding privacy here will make the SC run like [mysql-diff-release-parallelbig-withperfschema](https://fburl.com/sandcastle/3xcrabur) to include privacy suite. Also, remove `show variables like` to prevent test breaking whenever a new sys variable is introduced. Reviewed By: aditya-jalan Differential Revision: D29154929 fbshipit-source-id: 8fb63adc11d
percona · Jun 17, 2021 · 1721ff6 · 1721ff6
1 parent 8dfbf79
commit 1721ff6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 23 deletions.
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -238,7 +238,7 @@
 # Suites run by default (i.e. when invoking ./mtr without parameters)
 #
 our $DEFAULT_SUITES =
-"rpl_mts,auth_sec,binlog_gtid,binlog_nogtid,clone,collations,column_statistics,connection_control,encryption,federated,funcs_2,gcol,grant,sysschema,gis,information_schema,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,rpl,rpl_gtid,rpl_nogtid,rpl_recovery,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,binlog,test_service_sql_api,test_services,x";
+"rpl_mts,auth_sec,binlog_gtid,binlog_nogtid,clone,collations,column_statistics,connection_control,encryption,federated,funcs_2,gcol,grant,sysschema,gis,information_schema,innodb,innodb_fts,innodb_gis,innodb_undo,innodb_zip,json,main,opt_trace,parts,perfschema,query_rewrite_plugins,rpl,rpl_gtid,rpl_nogtid,rpl_recovery,secondary_engine,service_status_var_registration,service_sys_var_registration,service_udf_registration,sys_vars,binlog,test_service_sql_api,test_services,x,privacy";
 
 # End of list of default suites
 

diff --git a/mysql-test/suite/privacy/r/privacy_configerator_policy_fail_open_pes_check_pass.result b/mysql-test/suite/privacy/r/privacy_configerator_policy_fail_open_pes_check_pass.result
@@ -6,15 +6,6 @@ PRIMARY KEY (`id`)
 INSERT INTO privacy_blood_donation_table VALUES(1, "User1");
 set @original_privacy_plugin_purpose_policy_check=@@session.privacy_plugin_purpose_policy_check;
 set session privacy_plugin_purpose_policy_check=fail_open;
-show variables like 'privacy_plugin_%';
-Variable_name	Value
-privacy_plugin_purpose_policy_cache_control	OFF
-privacy_plugin_purpose_policy_cache_retention	0
-privacy_plugin_purpose_policy_check	FAIL_OPEN
-privacy_plugin_purpose_policy_check_always_false	OFF
-privacy_plugin_purpose_policy_check_bypass_evaluator	OFF
-privacy_plugin_purpose_policy_check_debug_dump	OFF
-privacy_plugin_response_attrs_contain_policy_status	OFF
 select * from privacy_blood_donation_table;
 id	name
 1	User1

diff --git a/mysql-test/suite/privacy/r/privacy_plugin_cache.result b/mysql-test/suite/privacy/r/privacy_plugin_cache.result
@@ -9,15 +9,6 @@ set global privacy_plugin_purpose_policy_cache_control=on;
 set global privacy_plugin_purpose_policy_cache_retention=15;
 set global performance_schema_esms_by_all=on;
 set global sql_findings_control=on;
-show variables like 'privacy_plugin%';
-Variable_name	Value
-privacy_plugin_purpose_policy_cache_control	ON
-privacy_plugin_purpose_policy_cache_retention	15
-privacy_plugin_purpose_policy_check	FAIL_OPEN
-privacy_plugin_purpose_policy_check_always_false	OFF
-privacy_plugin_purpose_policy_check_bypass_evaluator	OFF
-privacy_plugin_purpose_policy_check_debug_dump	OFF
-privacy_plugin_response_attrs_contain_policy_status	OFF
 CREATE TABLE privacy_research (
 id int NOT NULL,
 name VARCHAR(30)   NOT NULL DEFAULT '',

diff --git a/mysql-test/suite/privacy/t/privacy_configerator_policy_fail_open_pes_check_pass.test b/mysql-test/suite/privacy/t/privacy_configerator_policy_fail_open_pes_check_pass.test
@@ -9,7 +9,6 @@ INSERT INTO privacy_blood_donation_table VALUES(1, "User1");
 
 set @original_privacy_plugin_purpose_policy_check=@@session.privacy_plugin_purpose_policy_check;
 set session privacy_plugin_purpose_policy_check=fail_open;
-show variables like 'privacy_plugin_%';
 query_attrs_add shard xdb.dbclient_test.1;
 
 select * from privacy_blood_donation_table;

diff --git a/mysql-test/suite/privacy/t/privacy_plugin_cache.test b/mysql-test/suite/privacy/t/privacy_plugin_cache.test
@@ -26,9 +26,6 @@ set global sql_findings_control=on;
 query_attrs_add shard xdb.dbclient_test.1;
 query_attrs_add query_policy fbig::research;
 
-### check system/session setup
-show variables like 'privacy_plugin%';
-
 ### setup test (table, ...)
 CREATE TABLE privacy_research (
     id int NOT NULL,