From ab429c18f7b5463def601e3907d3875d69a62562 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Fri, 22 Sep 2023 10:22:36 +0000
Subject: [PATCH] Testsuite verification for 10.5.20 version

Fedora commit: a6a41d44d00e47bc2aa20feb76481abe49e538af

- skipped test lists format fixed
- code for applying skipped tests list added to the SPIDER suites

Related: RHEL-8411
---
 mariadb.spec               | 4 +++-
 rh-skipped-tests-base.list | 5 +++--
 rh-skipped-tests-ppc.list  | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index b7d0139..3ac3679 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -11,7 +11,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.5.18
+%global last_tested_version 10.5.20
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -1251,6 +1251,8 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
     perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix,spider/handler \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
+    %else
+      --skip-test-list=unstable-tests
     %endif
   # blank line
   fi
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 8b207b5..7af2374 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -80,9 +80,10 @@ main.lock_kill                               :
 
 # Fails since 10.5.20
 innodb.innodb_bug51920                      :
+innodb.row_size_error_log_warnings_3        :
 binlog_encryption.rpl_cant_read_event_incident :
-spider/bg.spider_fixes                      :
-spider/bugfix.mdev_29904                    :
+bg.spider_fixes                             :
+bugfix.mdev_29904                          : "[Warning] mariadbd: Can't get hardware address with error 0"
 sys_vars.completion_type_func               :
 rpl.rpl_report_port                         :
 rpl.rpl_reset_slave_fail                    :
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index 403da66..7b982e0 100644
--- a/rh-skipped-tests-ppc.list
+++ b/rh-skipped-tests-ppc.list
@@ -1,5 +1,7 @@
 # Fails on ppc64le since 10.4.12
 oqgraph.social : 
 
-# Fails since 10.5.2
-rh-skipped-tests-ppc.list :
+# Fails since 10.5.20
+innodb.innodb_defrag_concurrent        :
+parts.partition_alter4_innodb          :
+rpl.rpl_parallel_optimistic_xa_lsu_off :