From a15873e8be3bf0c6871028a13e75768bca50aeb4 Mon Sep 17 00:00:00 2001 From: val Date: Mon, 27 Apr 2020 10:22:59 +0000 Subject: [PATCH] tap cleanup --- test/tap/tests/Makefile | 30 +++++++++---------- .../proxysql_reference_select_config_file.cnf | 9 ++++++ test/tap/tests/select_config_file-t.cpp | 7 +++++ test/tap/tests/test_firewall-t.cpp | 13 ++++++-- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile index 52d866f1d..74e14b2c4 100644 --- a/test/tap/tests/Makefile +++ b/test/tap/tests/Makefile @@ -68,7 +68,7 @@ INCLUDEDIRS=-I../tap -I$(RE2_PATH) -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(SQLITE3_DIR) LDIRS=-L$(TAP_LIBDIR) -L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR) MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt $(EXTRALINK) -STATIC_LIBS=$(MARIADB_LDIR)/libmariadbclient.a +STATIC_LIBS= $(SSL_LDIR)/libssl.a $(SSL_LDIR)/libcrypto.a .PHONY: all all: tests @@ -77,7 +77,7 @@ all: tests clean: rm -f basic-t set_character_set-t charset_unsigned_int-t select_config_file-t sqlite3-t galera_1_timeout_count galera_2_timeout_no_count aurora test_set_character_results-t test_ps_large_result-t set_testing-t test_firewall-t test_default_value_transaction_isolation-t || true -OPT=-O2 +OPT=-O2 -Wl,--no-as-needed SRC=basic-t.cpp set_character_set-t.cpp charset_unsigned_int-t.cpp select_config_file-t.cpp sqlite3-t.cpp galera_1_timeout_count.cpp galera_2_timeout_no_count.cpp aurora.cpp test_set_character_results-t.cpp test_ps_large_result-t.cpp set_testing-t.cpp test_firewall-t.cpp test_default_value_transaction_isolation-t.cpp @@ -86,40 +86,40 @@ testgalera: galera_1_timeout_count galera_2_timeout_no_count testaurora: aurora sqlite3-t: $(TAP_LIBDIR)/libtap.a sqlite3-t.cpp - g++ sqlite3-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) $(MYLIBS) -lpthread -ldl -std=c++11 -ltap -o sqlite3-t + g++ sqlite3-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) $(MYLIBS) -lpthread -ldl -std=c++11 -ltap $(STATIC_LIBS) -o sqlite3-t basic-t: $(TAP_LIBDIR)/libtap.a - g++ basic-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -o basic-t + g++ basic-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap $(STATIC_LIBS) -o basic-t set_character_set-t: set_character_set-t.cpp $(TAP_LIBDIR)/libtap.a - g++ set_character_set-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) -o set_character_set-t + g++ set_character_set-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) $(STATIC_LIBS) -o set_character_set-t charset_unsigned_int-t: charset_unsigned_int-t.cpp $(TAP_LIBDIR)/libtap.a - g++ charset_unsigned_int-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) -o charset_unsigned_int-t + g++ charset_unsigned_int-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) $(STATIC_LIBS) -o charset_unsigned_int-t select_config_file-t: select_config_file-t.cpp $(TAP_LIBDIR)/libtap.a - g++ select_config_file-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) -o select_config_file-t + g++ select_config_file-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) $(STATIC_LIBS) -o select_config_file-t test_set_character_results-t: test_set_character_results-t.cpp $(TAP_LIBDIR)/libtap.a - g++ test_set_character_results-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -lssl -lcrypto -ldl -lpthread -o test_set_character_results-t + g++ test_set_character_results-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -ldl -lpthread $(STATIC_LIBS) -o test_set_character_results-t test_ps_large_result-t: test_ps_large_result-t.cpp $(TAP_LIBDIR)/libtap.a - g++ test_ps_large_result-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -lssl -lcrypto -ldl -lpthread -o test_ps_large_result-t + g++ test_ps_large_result-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -ldl -lpthread $(STATIC_LIBS) -o test_ps_large_result-t test_firewall-t: test_firewall-t.cpp $(TAP_LIBDIR)/libtap.a - g++ test_firewall-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -lssl -lcrypto -ldl -lpthread -o test_firewall-t + g++ test_firewall-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -ldl -lpthread $(STATIC_LIBS) -o test_firewall-t galera_1_timeout_count: galera_1_timeout_count.cpp $(TAP_LIBDIR)/libtap.a - g++ -DTEST_GALERA -DDEBUG galera_1_timeout_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_1_timeout_count -DGITVERSION=\"$(GIT_VERSION)\" + g++ -DTEST_GALERA -DDEBUG galera_1_timeout_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl $(STATIC_LIBS) -o galera_1_timeout_count -DGITVERSION=\"$(GIT_VERSION)\" galera_2_timeout_no_count: galera_2_timeout_no_count.cpp $(TAP_LIBDIR)/libtap.a - g++ -DTEST_GALERA -DDEBUG galera_2_timeout_no_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_2_timeout_no_count -DGITVERSION=\"$(GIT_VERSION)\" + g++ -DTEST_GALERA -DDEBUG galera_2_timeout_no_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl $(STATIC_LIBS) -o galera_2_timeout_no_count -DGITVERSION=\"$(GIT_VERSION)\" aurora: aurora.cpp $(TAP_LIBDIR)/libtap.a - g++ -DTEST_AURORA -DDEBUG aurora.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o aurora -DGITVERSION=\"$(GIT_VERSION)\" + g++ -DTEST_AURORA -DDEBUG aurora.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl $(STATIC_LIBS) -o aurora -DGITVERSION=\"$(GIT_VERSION)\" set_testing-t: set_testing-t.cpp $(TAP_LIBDIR)/libtap.a - g++ set_testing-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl -lssl -lcrypto -o set_testing-t + g++ set_testing-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl $(STATIC_LIBS) -o set_testing-t test_default_value_transaction_isolation-t: test_default_value_transaction_isolation-t.cpp $(TAP_LIBDIR)/libtap.a - g++ test_default_value_transaction_isolation-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl -lssl -lcrypto -o test_default_value_transaction_isolation-t + g++ test_default_value_transaction_isolation-t.cpp -Wall $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++10 $(MYLIBS) -ltap -pthread -O0 -ggdb -ldl -lssl -lcrypto -o test_default_value_transaction_isolation-t diff --git a/test/tap/tests/proxysql_reference_select_config_file.cnf b/test/tap/tests/proxysql_reference_select_config_file.cnf index 71f3bc75b..7deb6c550 100644 --- a/test/tap/tests/proxysql_reference_select_config_file.cnf +++ b/test/tap/tests/proxysql_reference_select_config_file.cnf @@ -88,13 +88,20 @@ mysql_variables = connect_timeout_server_max="mysql" connection_delay_multiplex_ms="mysql" connection_max_age_ms="mysql" + connection_warming="mysql" connpoll_reset_queue_length="mysql" + default_CHARSET="mysql" + default_action="mysql" + default_character_set_client="mysql" + default_character_set_connection="mysql" + default_character_set_database="mysql" default_character_set_results="mysql" default_charset="mysql" default_collation_connection="mysql" default_isolation_level="mysql" default_max_join_size="mysql" default_max_latency_ms="mysql" + default_names="mysql" default_net_write_timeout="mysql" default_query_delay="mysql" default_query_timeout="mysql" @@ -102,12 +109,14 @@ mysql_variables = default_schema="mysql" default_session_track_gtids="mysql" default_sql_auto_is_null="mysql" + default_sql_log_bin="mysql" default_sql_mode="mysql" default_sql_safe_updates="mysql" default_sql_select_limit="mysql" default_time_zone="mysql" default_transaction_read="mysql" default_tx_isolation="mysql" + default_wsrep_sync_wait="mysql" enforce_autocommit_on_reads="mysql" eventslog_default_log="mysql" eventslog_filename="mysql" diff --git a/test/tap/tests/select_config_file-t.cpp b/test/tap/tests/select_config_file-t.cpp index 276780b5a..f116d1a7f 100644 --- a/test/tap/tests/select_config_file-t.cpp +++ b/test/tap/tests/select_config_file-t.cpp @@ -126,12 +126,19 @@ int main(int argc, char** argv) { #endif MYSQL_QUERY(mysql, "load mysql variables from disk"); + MYSQL_QUERY(mysql, "load mysql variables to runtime"); MYSQL_QUERY(mysql, "load admin variables from disk"); + MYSQL_QUERY(mysql, "load admin variables to runtime"); MYSQL_QUERY(mysql, "load mysql users from disk"); + MYSQL_QUERY(mysql, "load mysql users to runtime"); MYSQL_QUERY(mysql, "load mysql servers from disk"); + MYSQL_QUERY(mysql, "load mysql servers to runtime"); MYSQL_QUERY(mysql, "load scheduler from disk"); + MYSQL_QUERY(mysql, "load scheduler to runtime"); MYSQL_QUERY(mysql, "load restapi from disk"); + MYSQL_QUERY(mysql, "load restapi to runtime"); MYSQL_QUERY(mysql, "load proxysql servers from disk"); + MYSQL_QUERY(mysql, "load proxysql servers to runtime"); mysql_close(mysql); diff --git a/test/tap/tests/test_firewall-t.cpp b/test/tap/tests/test_firewall-t.cpp index b15cf47d0..70fbafbee 100644 --- a/test/tap/tests/test_firewall-t.cpp +++ b/test/tap/tests/test_firewall-t.cpp @@ -17,7 +17,7 @@ int main(int argc, char** argv) { if(cl.getEnv()) return exit_status(); - plan(3); + plan(7); diag("Testing firewall whitelist functionality"); MYSQL* mysqladmin = mysql_init(NULL); @@ -55,7 +55,7 @@ int main(int argc, char** argv) { mysql_free_result(result); MYSQL_QUERY(mysqladmin, "update global_variables set variable_value=1 where variable_name='mysql-firewall_whitelist_enabled'"); - MYSQL_QUERY(mysqladmin, "load mysql users to runtime"); + MYSQL_QUERY(mysqladmin, "load mysql variables to runtime"); // Test that firewall initialized and blocks all queries if (mysql_query(mysql, "select @@version")) { @@ -138,6 +138,15 @@ int main(int argc, char** argv) { ok(false, "Query should be allowed by firewall, but it is blocked after active=1 update"); } + // Cleanup firewall rules + MYSQL_QUERY(mysqladmin, "load mysql firewall from disk"); + MYSQL_QUERY(mysqladmin, "load mysql firewall to runtime"); + + // Clean up variables + MYSQL_QUERY(mysqladmin, "load mysql variables from disk"); + MYSQL_QUERY(mysqladmin, "load mysql variables to runtime"); + + mysql_close(mysql); mysql_close(mysqladmin);