Store the testfile in a variable for easier maintenance

Ticket: CFE-1840, ENT-10961
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

tests/acceptance/10_files/unsafe/00_immutable.cf

@@ -11,6 +11,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/00_immutable.txt";
+}
+
 body fsattrs set_immutable
 {
   immutable => "true";
@@ -19,11 +26,11 @@ body fsattrs set_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_00.txt"
+    "$(global.testfile)"
         create => "true";
 
   commands:
-    "chattr -i /tmp/immutable_00.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -38,26 +45,26 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_00.txt"
+    "$(global.testfile)"
       fsattrs => set_immutable;
 }
 
 bundle agent check
 {
   methods:
     "check"
-      usebundle => dcs_passif_output(".*Immutable.*", "", "lsattr -l /tmp/immutable_00.txt", "$(this.promise_filename)");
+      usebundle => dcs_passif_output(".*Immutable.*", "", "lsattr -l $(global.testfile)", "$(this.promise_filename)");
 }
 
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_00.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_00.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
 }

tests/acceptance/10_files/unsafe/01_immutable.cf

@@ -11,6 +11,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/01_immutable.txt";
+}
+
 body fsattrs clear_immutable
 {
   immutable => "false";
@@ -19,11 +26,11 @@ body fsattrs clear_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_01.txt"
+    "$(global.testfile)"
         create => "true";
 
   commands:
-    "chattr +i /tmp/immutable_01.txt"
+    "chattr +i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -38,26 +45,26 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_01.txt"
+    "$(global.testfile)"
       fsattrs => clear_immutable;
 }
 
 bundle agent check
 {
   methods:
     "check"
-      usebundle => dcs_passif_output(".*", ".*Immutable.*", "lsattr -l /tmp/immutable_01.txt", "$(this.promise_filename)");
+      usebundle => dcs_passif_output(".*", ".*Immutable.*", "lsattr -l $(global.testfile)", "$(this.promise_filename)");
 }
 
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_01.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_01.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
 }

tests/acceptance/10_files/unsafe/02_immutable.cf

@@ -12,6 +12,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/02_immutable.txt";
+}
+
 body fsattrs set_immutable
 {
   immutable => "true";
@@ -20,11 +27,11 @@ body fsattrs set_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_02.txt"
+    "$(global.testfile)"
       content => "I'm immutable";
 
   commands:
-    "chattr +i /tmp/immutable_02.txt"
+    "chattr +i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -39,7 +46,7 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_02.txt"
+    "$(global.testfile)"
       fsattrs => set_immutable,
       content => "But agent can override";
 }
@@ -50,7 +57,7 @@ bundle agent check
     "expected"
       string => "But agent can override";
     "actual"
-      string => readfile("/tmp/immutable_02.txt");
+      string => readfile("$(global.testfile)");
 
   classes:
     "ok"
@@ -68,12 +75,12 @@ bundle agent check
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_02.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_02.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
 }

tests/acceptance/10_files/unsafe/03_immutable.cf

@@ -12,6 +12,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/03_immutable.txt";
+}
+
 body fsattrs set_immutable
 {
   immutable => "true";
@@ -20,13 +27,13 @@ body fsattrs set_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_03.txt"
+    "$(global.testfile)"
       content => "I'm immutable";
     "/tmp/content.txt"
       content => "But agent can override";
 
   commands:
-    "chattr +i /tmp/immutable_03.txt"
+    "chattr +i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -41,7 +48,7 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_03.txt"
+    "$(global.testfile)"
       fsattrs => set_immutable,
       copy_from => local_dcp("/tmp/content.txt");
 }
@@ -52,7 +59,7 @@ bundle agent check
     "expected"
       string => "But agent can override";
     "actual"
-      string => readfile("/tmp/immutable_03.txt");
+      string => readfile("$(global.testfile)");
 
   classes:
     "ok"
@@ -70,15 +77,15 @@ bundle agent check
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_03.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_03.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
-    "/tmp/immutable_03.txt.cfsaved"
+    "$(global.testfile).cfsaved"
       delete => tidy;
     "/tmp/content.txt"
       delete => tidy;

tests/acceptance/10_files/unsafe/04_immutable.cf

@@ -12,6 +12,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/04_immutable.txt";
+}
+
 body fsattrs set_immutable
 {
   immutable => "true";
@@ -20,11 +27,11 @@ body fsattrs set_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_04.txt"
+    "$(global.testfile)"
       content => "I'm immutable";
 
   commands:
-    "chattr +i /tmp/immutable_04.txt"
+    "chattr +i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -39,7 +46,7 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_04.txt"
+    "$(global.testfile)"
       fsattrs => set_immutable,
       delete => tidy;
 }
@@ -48,7 +55,7 @@ bundle agent check
 {
   classes:
     "ok"
-      expression => not(fileexists("/tmp/immutable_04.txt"));
+      expression => not(fileexists("$(global.testfile)"));
 
   reports:
     ok::
@@ -60,12 +67,12 @@ bundle agent check
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_04.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_04.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
 }

tests/acceptance/10_files/unsafe/05_immutable.cf

@@ -12,6 +12,13 @@ body common control
   version => "1.0";
 }
 
+bundle agent global
+{
+  vars:
+    "testfile"
+      string => "/tmp/05_immutable.txt";
+}
+
 body fsattrs set_immutable
 {
   immutable => "true";
@@ -20,11 +27,11 @@ body fsattrs set_immutable
 bundle agent init
 {
   files:
-    "/tmp/immutable_05.txt"
+    "$(global.testfile)"
       content => "I'm immutable";
 
   commands:
-    "chattr +i /tmp/immutable_05.txt"
+    "chattr +i $(global.testfile)"
       contain => in_shell;
 }
 
@@ -45,7 +52,7 @@ bundle agent test
       meta => { "CFE-1840", "ENT-10961" };
 
   files:
-    "/tmp/immutable_05.txt"
+    "$(global.testfile)"
       fsattrs => set_immutable,
       edit_line => insert_line;
 }
@@ -56,7 +63,7 @@ bundle agent check
     "expected"
       string => "I'm immutable$(const.n)But agent can override$(const.n)";
     "actual"
-      string => readfile("/tmp/immutable_05.txt");
+      string => readfile("$(global.testfile)");
 
   classes:
     "ok"
@@ -74,14 +81,14 @@ bundle agent check
 bundle agent destroy
 {
   commands:
-    "chattr -i /tmp/immutable_05.txt"
+    "chattr -i $(global.testfile)"
       contain => in_shell,
       handle => "is mutable";
 
   files:
-    "/tmp/immutable_05.txt"
+    "$(global.testfile)"
       delete => tidy,
       depends_on => { "is mutable" };
-    "/tmp/immutable_05.txt.cf-before-edit"
+    "$(global.testfile).cf-before-edit"
       delete => tidy;
 }