From f273d4f65ce6d04b4e6095df1449144f76cf14b1 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 17 Aug 2019 20:39:58 +0200
Subject: [PATCH] dev-db/mysql: disable tests requiring <openssl-1.1.1

Bug: https://bugs.gentoo.org/679264
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
 dev-db/mysql/mysql-5.6.44-r1.ebuild | 11 +++++-----
 dev-db/mysql/mysql-5.6.45-r1.ebuild | 11 +++++-----
 dev-db/mysql/mysql-5.7.26.ebuild    | 32 +++++++++++++++++++++++++++++
 dev-db/mysql/mysql-5.7.27.ebuild    | 32 +++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index c9f4057f7019..e51ea5affde5 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -501,14 +501,15 @@ src_test() {
 	if has_version '>=dev-libs/openssl-1.1.0' ; then
 		# Tests are expecting <openssl-1.1 default cipher
 		for t in \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
 			main.ssl_8k_key \
-			main.ssl-sha512 \
-			main.ssl_crl \
 			main.ssl_ca \
-			main.ssl \
+			main.ssl_cipher\
 			main.ssl_compress \
-			main.plugin_auth_sha256_tls \
-			main.openssl_1 \
+			main.ssl_crl \
+			main.ssl-sha512 \
 		; do
 			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.0"
 		done
diff --git a/dev-db/mysql/mysql-5.6.45-r1.ebuild b/dev-db/mysql/mysql-5.6.45-r1.ebuild
index 138b0cab8501..dfea0d2a2a47 100644
--- a/dev-db/mysql/mysql-5.6.45-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r1.ebuild
@@ -506,14 +506,15 @@ src_test() {
 	if has_version '>=dev-libs/openssl-1.1.0' ; then
 		# Tests are expecting <openssl-1.1 default cipher
 		for t in \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
 			main.ssl_8k_key \
-			main.ssl-sha512 \
-			main.ssl_crl \
 			main.ssl_ca \
-			main.ssl \
+			main.ssl_cipher\
 			main.ssl_compress \
-			main.plugin_auth_sha256_tls \
-			main.openssl_1 \
+			main.ssl_crl \
+			main.ssl-sha512 \
 		; do
 			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.0"
 		done
diff --git a/dev-db/mysql/mysql-5.7.26.ebuild b/dev-db/mysql/mysql-5.7.26.ebuild
index e7e64676eaca..e7550e70b180 100644
--- a/dev-db/mysql/mysql-5.7.26.ebuild
+++ b/dev-db/mysql/mysql-5.7.26.ebuild
@@ -605,6 +605,38 @@ src_test() {
 		done
 	fi
 
+	if has_version '>=dev-libs/openssl-1.1.1' ; then
+		# Tests are expecting <openssl-1.1.1 default cipher
+		for t in \
+			auth_sec.cert_verify \
+			auth_sec.mysql_ssl_connection \
+			auth_sec.openssl_cert_generation \
+			auth_sec.ssl_auto_detect \
+			auth_sec.ssl_mode \
+			auth_sec.tls \
+			binlog.binlog_grant_alter_user \
+			encryption.innodb_onlinealter_encryption \
+			main.grant_alter_user_qa \
+			main.grant_user_lock_qa \
+			main.mysql_ssl_default \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_bug75311 \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl_ecdh \
+			main.ssl_verify_identity \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
+		done
+	fi
+
 	# Try to increase file limits to increase test coverage
 	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
 		# Upper limit comes from parts.partition_* tests
diff --git a/dev-db/mysql/mysql-5.7.27.ebuild b/dev-db/mysql/mysql-5.7.27.ebuild
index af33f7a4a314..81848199c426 100644
--- a/dev-db/mysql/mysql-5.7.27.ebuild
+++ b/dev-db/mysql/mysql-5.7.27.ebuild
@@ -612,6 +612,38 @@ src_test() {
 		done
 	fi
 
+	if has_version '>=dev-libs/openssl-1.1.1' ; then
+		# Tests are expecting <openssl-1.1.1 default cipher
+		for t in \
+			auth_sec.cert_verify \
+			auth_sec.mysql_ssl_connection \
+			auth_sec.openssl_cert_generation \
+			auth_sec.ssl_auto_detect \
+			auth_sec.ssl_mode \
+			auth_sec.tls \
+			binlog.binlog_grant_alter_user \
+			encryption.innodb_onlinealter_encryption \
+			main.grant_alter_user_qa \
+			main.grant_user_lock_qa \
+			main.mysql_ssl_default \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_bug75311 \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl_ecdh \
+			main.ssl_verify_identity \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
+		done
+	fi
+
 	# Try to increase file limits to increase test coverage
 	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
 		# Upper limit comes from parts.partition_* tests
-- 
2.26.2