minor tests_group_ssl-matrix fixes and data/helper files

sysown · Sep 27, 2023 · 20d6152 · 20d6152
1 parent 29bf97a
commit 20d6152
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 11 deletions.
diff --git a/test/tap/tests/clickhouse_php_conn-t.php b/test/tap/tests/clickhouse_php_conn-t.php
@@ -37,7 +37,7 @@
 echo ":: Creating ProxySQL Admin connection...".PHP_EOL;
 $proxy_admin = new mysqli("127.0.0.1", $admin_user, $admin_pass, "", $admin_port);
 if ($proxy_admin->connect_errno) {
-    die("PorxySQL connect failed: " . $proxy->connect_error);
+    die("ProxySQL connect failed: " . $proxy->connect_error);
 }
 echo ":: ProxySQL ProxySQL Admin connection completed".PHP_EOL;
 
@@ -49,7 +49,7 @@
 echo ":: Creating ProxySQL connection...".PHP_EOL;
 $proxy = new mysqli("127.0.0.1", $username, $password, "", $port);
 if ($proxy->connect_errno) {
-    die("PorxySQL connect failed: " . $proxy->connect_error);
+    die("ProxySQL connect failed: " . $proxy->connect_error);
 }
 echo ":: ProxySQL connection completed".PHP_EOL;
 

diff --git a/test/tap/tests/test_backend_conn_ping-t.cpp b/test/tap/tests/test_backend_conn_ping-t.cpp
@@ -494,13 +494,13 @@ int main(int, char**) {
 	double its = (conn_creation_intv - b_0/rate) / ( b / rate );
 	double delay_s = conn_creation_intv / its;
 
-	plan(
-		2+2 + // connections
-		b_0*2 + //
-		its*(b*2)*2 + // * num of hg?
-		4 // tests
-	);
-	diag(">>> %d <<<", its);
+//	plan(
+//		2+2 + // connections
+//		b_0*2 + //
+//		its*(b*2)*2 + // * num of hg?
+//		4 // tests
+//	);
+
 	// Cleanup previous backend connections
 	diag("Cleaning up previous backend connections...");
 	MYSQL_QUERY(proxy_admin, "UPDATE mysql_servers SET max_connections=0");

diff --git a/test/tap/tests/test_binlog_fast_forward-t.cpp b/test/tap/tests/test_binlog_fast_forward-t.cpp
@@ -110,7 +110,7 @@ int setup_replication(int server_id, bool frontend_ssl, bool backend_ssl, std::v
 	admin_queries.push_back("LOAD MYSQL SERVERS TO RUNTIME");
 
 	MYSQL * mysql = mysql_init(NULL);
-	diag("Connecting: cl.root_username='%s' cl.use_ssl=%d", cl.root_username, cl.use_ssl);
+	diag("Connecting: cl.root_username='%s' frontend_ssl=%d", cl.root_username,frontend_ssl);
 	if (frontend_ssl)
 		mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
 	if (!mysql_real_connect(mysql, cl.root_host, cl.root_username, cl.root_password, NULL, cl.root_port, NULL, 0)) {

diff --git a/test/tap/tests/test_sqlite3_server-t.cpp b/test/tap/tests/test_sqlite3_server-t.cpp
@@ -341,7 +341,7 @@ int main(int argc, char** argv) {
 
 	// plan as many tests as queries
 	plan(
-		2+2+2 + // connect
+		2+2+2+2 + // connect
 		2 /* Fail to connect with wrong username and password */ + successful_queries.size()
 		+ unsuccessful_queries.size() + admin_queries.size() + sqlite_intf_queries.size()
 		+ 2 /* Check port is properly taken by ProxySQL without error after each change */

diff --git a/test/tap/tests_group_ssl-matrix/aws_ssl_certs b/test/tap/tests_group_ssl-matrix/aws_ssl_certs
@@ -0,0 +1 @@
+../tests/aws_ssl_certs
diff --git a/test/tap/tests_group_ssl-matrix/client_host_err b/test/tap/tests_group_ssl-matrix/client_host_err
@@ -0,0 +1 @@
+../tests/client_host_err
diff --git a/test/tap/tests_group_ssl-matrix/generate_set_session_csv b/test/tap/tests_group_ssl-matrix/generate_set_session_csv
@@ -0,0 +1 @@
+../tests/generate_set_session_csv
diff --git a/test/tap/tests_group_ssl-matrix/load_data_local_datadir b/test/tap/tests_group_ssl-matrix/load_data_local_datadir
@@ -0,0 +1 @@
+../tests/load_data_local_datadir
diff --git a/test/tap/tests_group_ssl-matrix/reg_test_3223_scripts b/test/tap/tests_group_ssl-matrix/reg_test_3223_scripts
@@ -0,0 +1 @@
+../tests/reg_test_3223_scripts
diff --git a/test/tap/tests_group_ssl-matrix/reg_test_3504-change_user_libmariadb_helper b/test/tap/tests_group_ssl-matrix/reg_test_3504-change_user_libmariadb_helper
@@ -0,0 +1 @@
+../tests/reg_test_3504-change_user_libmariadb_helper
diff --git a/test/tap/tests_group_ssl-matrix/reg_test_3504-change_user_libmysql_helper b/test/tap/tests_group_ssl-matrix/reg_test_3504-change_user_libmysql_helper
@@ -0,0 +1 @@
+../tests/reg_test_3504-change_user_libmysql_helper
diff --git a/test/tap/tests_group_ssl-matrix/reg_test_3838_scripts b/test/tap/tests_group_ssl-matrix/reg_test_3838_scripts
@@ -0,0 +1 @@
+../tests/reg_test_3838_scripts
diff --git a/test/tap/tests_group_ssl-matrix/reg_test_3847_node_datadir b/test/tap/tests_group_ssl-matrix/reg_test_3847_node_datadir
@@ -0,0 +1 @@
+../tests/reg_test_3847_node_datadir
diff --git a/test/tap/tests_group_ssl-matrix/set_testing-t.csv b/test/tap/tests_group_ssl-matrix/set_testing-t.csv
@@ -0,0 +1 @@
+../tests/set_testing-t.csv
diff --git a/test/tap/tests_group_ssl-matrix/setparser_test b/test/tap/tests_group_ssl-matrix/setparser_test
@@ -0,0 +1 @@
+../tests/setparser_test
diff --git a/test/tap/tests_group_ssl-matrix/setparser_test2 b/test/tap/tests_group_ssl-matrix/setparser_test2
@@ -0,0 +1 @@
+../tests/setparser_test2
diff --git a/test/tap/tests_group_ssl-matrix/setparser_test3 b/test/tap/tests_group_ssl-matrix/setparser_test3
@@ -0,0 +1 @@
+../tests/setparser_test3
diff --git a/test/tap/tests_group_ssl-matrix/test_cluster_sync_config b/test/tap/tests_group_ssl-matrix/test_cluster_sync_config
@@ -0,0 +1 @@
+../tests/test_cluster_sync_config
diff --git a/test/tap/tests_group_ssl-matrix/tokenizer_payloads b/test/tap/tests_group_ssl-matrix/tokenizer_payloads
@@ -0,0 +1 @@
+../tests/tokenizer_payloads
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../tests/reg_test_3504-change_user_libmariadb_helper
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../tests/reg_test_3504-change_user_libmysql_helper