From d452b9816d7689f8b09b7a53581a489381170e20 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Mon, 9 Oct 2023 15:19:05 -0500
Subject: [PATCH] Fixed two acceptance tests which could only run once before
 failing

Their first run they change an original/source file and so on subsequent runs
the tests failed due to the original being incorrect.

Ticket: ENT-10761
Changelog: none
(cherry picked from commit c8af66eb2b802230b92e8cb6708dfd1c7903c633)
---
 tests/acceptance/31_tickets/ENT-8788/1/main.cf | 15 ++++++++++++---
 tests/acceptance/31_tickets/ENT-8788/2/main.cf | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/31_tickets/ENT-8788/1/main.cf b/tests/acceptance/31_tickets/ENT-8788/1/main.cf
index aebde408fc..d02bf2652b 100644
--- a/tests/acceptance/31_tickets/ENT-8788/1/main.cf
+++ b/tests/acceptance/31_tickets/ENT-8788/1/main.cf
@@ -11,6 +11,16 @@ bundle agent __main__
         "bundlesequence"  usebundle => default("$(this.promise_filename)");
 }
 
+bundle agent init
+{
+  vars:
+      "original_file" string => "$(this.promise_dirname)/start.xml.txt";
+      "test_file" string => "$(sys.workdir)/start.xml.test";
+  files:
+      "$(test_file)"
+        copy_from => local_cp("${original_file}");
+}
+
 bundle agent test
 {
   meta:
@@ -19,11 +29,10 @@ bundle agent test
         meta => { "ENT-8788" };
 
   vars:
-      "test_file" string => "$(this.promise_dirname)/start.xml.txt";
       "new_content_file" string => "$(this.promise_dirname)/newcontent.xml.txt";
 
   files:
-    "$(test_file)"
+    "$(init.test_file)"
         create => "false",
         edit_defaults => size("500k"),
         edit_line => insert_file_as_block_relative_to_first_or_last_line(
@@ -38,7 +47,7 @@ bundle agent check
 {
   methods:
 
-      "Pass/Fail" usebundle => dcs_check_diff($(test.test_file),
+      "Pass/Fail" usebundle => dcs_check_diff($(init.test_file),
                                               "$(this.promise_dirname)/desired-result.xml.txt",
                                               $(this.promise_filename));
 }
diff --git a/tests/acceptance/31_tickets/ENT-8788/2/main.cf b/tests/acceptance/31_tickets/ENT-8788/2/main.cf
index 0f5226643e..0dd281f65b 100644
--- a/tests/acceptance/31_tickets/ENT-8788/2/main.cf
+++ b/tests/acceptance/31_tickets/ENT-8788/2/main.cf
@@ -11,6 +11,16 @@ bundle agent __main__
         "bundlesequence"  usebundle => default("$(this.promise_filename)");
 }
 
+bundle agent init
+{
+  vars:
+      "original_file" string => "$(this.promise_dirname)/start.xml.txt";
+      "test_file" string => "$(sys.workdir)/start.xml.test";
+  files:
+      "$(test_file)"
+        copy_from => local_cp("${original_file}");
+}
+
 bundle agent test
 {
   meta:
@@ -19,11 +29,10 @@ bundle agent test
         meta => { "ENT-8788" };
 
   vars:
-      "test_file" string => "$(this.promise_dirname)/start.xml.txt";
       "new_content_file" string => "$(this.promise_dirname)/newcontent.xml.txt";
 
   files:
-    "$(test_file)"
+    "$(init.test_file)"
         create => "false",
         edit_defaults => size("500k"),
         edit_line => insert_file_as_block_relative_to_first_or_last_line(
@@ -38,7 +47,7 @@ bundle agent check
 {
   methods:
 
-      "Pass/Fail" usebundle => dcs_check_diff($(test.test_file),
+      "Pass/Fail" usebundle => dcs_check_diff($(init.test_file),
                                               "$(this.promise_dirname)/desired-result.xml.txt",
                                               $(this.promise_filename));
 }