From 07592050808c24032e94875c34854ab0cadd45ad Mon Sep 17 00:00:00 2001
From: Aleksei Shpakovskii <aleksei.shpakovskii@northern.tech>
Date: Fri, 15 Sep 2023 15:02:56 +0200
Subject: [PATCH] Change suppress fail to soft fail on known failing tests

Ticket: ENT-10470

Issue was that these failures were visible in Jenkins,
turning build "unstable".

(cherry picked from commit 3d880734536a1d7c0d17f893153edf483b96b266)
---
 tests/acceptance/08_commands/01_modules/long-module-lines.cf | 4 ++--
 tests/acceptance/09_services/custom.cf                       | 2 +-
 tests/acceptance/09_services/disable.cf                      | 2 +-
 tests/acceptance/09_services/enable.cf                       | 2 +-
 tests/acceptance/09_services/reload.cf                       | 2 +-
 tests/acceptance/09_services/restart.cf                      | 2 +-
 tests/acceptance/09_services/service_cannot_be_resolved.cf   | 2 +-
 tests/acceptance/09_services/start.cf                        | 2 +-
 tests/acceptance/09_services/stop.cf                         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/acceptance/08_commands/01_modules/long-module-lines.cf b/tests/acceptance/08_commands/01_modules/long-module-lines.cf
index f6e523d157..b0535649a3 100644
--- a/tests/acceptance/08_commands/01_modules/long-module-lines.cf
+++ b/tests/acceptance/08_commands/01_modules/long-module-lines.cf
@@ -26,8 +26,8 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
-        meta => { "redmine1884" };
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-1623" };
 
   commands:
       "$(init.script_name)" module => "true";
diff --git a/tests/acceptance/09_services/custom.cf b/tests/acceptance/09_services/custom.cf
index dce6d60fe1..0830031e72 100644
--- a/tests/acceptance/09_services/custom.cf
+++ b/tests/acceptance/09_services/custom.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "CFE-2402" };
 
   services:
diff --git a/tests/acceptance/09_services/disable.cf b/tests/acceptance/09_services/disable.cf
index a717a6e106..ad8d97aa1d 100644
--- a/tests/acceptance/09_services/disable.cf
+++ b/tests/acceptance/09_services/disable.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "CFE-2402" };
 
   services:
diff --git a/tests/acceptance/09_services/enable.cf b/tests/acceptance/09_services/enable.cf
index 1a3424539f..86445a1963 100644
--- a/tests/acceptance/09_services/enable.cf
+++ b/tests/acceptance/09_services/enable.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "CFE-2402" };
 
   services:
diff --git a/tests/acceptance/09_services/reload.cf b/tests/acceptance/09_services/reload.cf
index ec3b6f7dbf..058b011fa8 100644
--- a/tests/acceptance/09_services/reload.cf
+++ b/tests/acceptance/09_services/reload.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "redmine4772,ENT-2161" };
 
   services:
diff --git a/tests/acceptance/09_services/restart.cf b/tests/acceptance/09_services/restart.cf
index 77ef03eed8..167557cd91 100644
--- a/tests/acceptance/09_services/restart.cf
+++ b/tests/acceptance/09_services/restart.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "redmine4772,ENT-2161" };
 
   services:
diff --git a/tests/acceptance/09_services/service_cannot_be_resolved.cf b/tests/acceptance/09_services/service_cannot_be_resolved.cf
index 4c3f865c1e..48161dd1d9 100644
--- a/tests/acceptance/09_services/service_cannot_be_resolved.cf
+++ b/tests/acceptance/09_services/service_cannot_be_resolved.cf
@@ -20,7 +20,7 @@ bundle agent init
 bundle common test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "redmine4772,ENT-2161" };
 
   classes:
diff --git a/tests/acceptance/09_services/start.cf b/tests/acceptance/09_services/start.cf
index aa75db174b..9a9d9b7b86 100644
--- a/tests/acceptance/09_services/start.cf
+++ b/tests/acceptance/09_services/start.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "redmine4772,ENT-2161" };
 
   services:
diff --git a/tests/acceptance/09_services/stop.cf b/tests/acceptance/09_services/stop.cf
index 2ad8c80c55..212be2b2ff 100644
--- a/tests/acceptance/09_services/stop.cf
+++ b/tests/acceptance/09_services/stop.cf
@@ -24,7 +24,7 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
+      "test_soft_fail" string => "windows",
         meta => { "redmine4772,ENT-2161" };
 
   services: