Notification time stamped 2021-07-01 00:13:07 UTC
From c60b15f247fbd070aef5ed1775e74600c4e51850 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm(a)redhat.com>
Date: Jun 29 2021 04:22:18 +0000
Subject: Extend the test to cover 3 scenarios
---
diff --git a/tests/mariadb_connection/runtest.sh b/tests/mariadb_connection/runtest.sh
index e5e928b..056ea88 100755
--- a/tests/mariadb_connection/runtest.sh
+++ b/tests/mariadb_connection/runtest.sh
@@ -56,25 +56,46 @@ rlJournalStart
# There should already be an entry for MariaDB connector for ODBC
rlAssertExists "/etc/odbcinst.ini"
rlAssertGrep "MariaDB" "/etc/odbcinst.ini"
+ # Start MariaDB
+ rlRun "systemctl start mariadb" 0
+ rlPhaseEnd
+
+
+ rlPhaseStartTest
+ # Insert the second part of the ODBC configuration
+ # with SOCKET defined
+ rlRun "cp -f socket_odbc.ini /etc/odbc.ini"
+ rlAssertExists "/etc/odbc.ini"
+ rlAssertGrep "MariaDB" "/etc/odbc.ini"
+ rlAssertGrep "SOCKET" "/etc/odbc.ini"
+
+ rlRun " echo \"SHOW DATABASES\" | isql -v mariadb-connector-odbc
" 0
+ rlRun " echo \"SELECT USER(),CURRENT_USER()\" | isql -v
mariadb-connector-odbc " 0
+ rlPhaseEnd
+
- # Now insert the second part of the ODBC configuration
+ rlPhaseStartTest
+ # Insert the second part of the ODBC configuration
+ # without SOCKET defined
rlRun "cp -f odbc.ini /etc/"
rlAssertExists "/etc/odbc.ini"
rlAssertGrep "MariaDB" "/etc/odbc.ini"
+ rlAssertNotGrep "SOCKET" "/etc/odbc.ini"
+
+ rlRun " echo \"SHOW DATABASES\" | isql -v mariadb-connector-odbc
" 1
+ rlRun " echo \"SELECT USER(),CURRENT_USER()\" | isql -v
mariadb-connector-odbc " 1
+ rlPhaseEnd
- # Start MariaDB
- rlRun "systemctl start mariadb" 0
+ rlPhaseStartTest
# Create a new DB user and password for this test
rlRun "echo \"CREATE USER
'odbc_connector_user'@'localhost' IDENTIFIED BY
'odbc_connector_password'\" | mysql " 0
# Save the credentials to a variable; we will append it to every isql command
rlRun "CREDENTIALS=\"odbc_connector_user
odbc_connector_password\"" 0
- rlPhaseEnd
- rlPhaseStartTest
- rlRun " echo \"SHOW DATABASES\" | isql -v mariadb-connector-odbc
$CREDENTIALS "
-
- rlRun " echo \"SELECT USER(),CURRENT_USER()\" | isql -v
mariadb-connector-odbc $CREDENTIALS "
+ rlRun " echo \"SHOW DATABASES\" | isql -v mariadb-connector-odbc
$CREDENTIALS " 0
+ rlRun " echo \"SELECT USER(),CURRENT_USER()\" | isql -v
mariadb-connector-odbc $CREDENTIALS " 0
rlPhaseEnd
+
rlJournalPrintText
rlJournalEnd
diff --git a/tests/mariadb_connection/socket_odbc.ini
b/tests/mariadb_connection/socket_odbc.ini
new file mode 100644
index 0000000..9a9d9d9
--- /dev/null
+++ b/tests/mariadb_connection/socket_odbc.ini
@@ -0,0 +1,4 @@
+[mariadb-connector-odbc]
+Driver=MariaDB
+SERVER=localhost
+SOCKET=/var/lib/mysql/mysql.sock
https://src.fedoraproject.org/rpms/mariadb-connector-odbc/c/c60b15f247fbd...