From c870dc4d2c77596ee3b72b5ce9a5047109518684 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Sep 17 2019 12:00:40 +0000
Subject: Extend the testsuite execution plan


---

diff --git a/mariadb.spec b/mariadb.spec
index c784e1f..192ca5f 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1149,7 +1149,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
   set -ex
   cd mysql-test
 
-  export common_testsuite_arguments=" --parallel=auto --force --retry=1 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=60 --max-test-fail=5 "
+  export common_testsuite_arguments=" --parallel=auto --force --retry=2 --suite-timeout=900 --testcase-timeout=30 --mysqld=--binlog-format=mixed --force-restart --shutdown-timeout=60 --max-test-fail=5 "
 
   # If full testsuite has already been run on this version and we don't explicitly want the full testsuite to be run
   if [[ "%{last_tested_version}" == "%{version}" ]] && [[ %{force_run_testsuite} -eq 0 ]]
@@ -1170,7 +1170,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
       --skip-test-list=unstable-tests
     %endif
     # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
-    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --mem --suite=spider,spider/bg,spider/bugfix,spider/handler \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %endif
@@ -1178,6 +1178,9 @@ export MTR_BUILD_THREAD=%{__isa_bits}
   fi
 )
 
+# NOTE: the Spider SE has 2 more hidden testsuites "oracle" and "oracle2".
+#       however, all of the tests fail with: "failed: 12521: Can't use wrapper 'oracle' for SQL connection"
+
 %endif
 %endif
 
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 8f26151..eb84580 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -36,3 +36,6 @@ main.mysql                                   :
 
 # Fails everywhere from 10.3.17
 versioning.update-big                        :
+
+# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
+plugins.auth_ed25519                        :
\ No newline at end of file