Fixed findlocalusers_unsafe test

Ticket: ENT-13533
Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf

@@ -14,47 +14,42 @@ bundle agent init
       create => "true";
 
   users:
-      "test_user1"
+      "testu1"
         policy => "present",
         home_dir => "/tmp/test_folder1",
         description => "TestUser 1",
-        group_primary => "users",
+        group_primary => "root", # we need a group which we know for sure the gid
         shell => "/bin/sh",
         uid => "12345";
 
-      "test_user2"
+      "testu2"
         policy => "present",
         home_dir => "/tmp/test_folder2",
         description => "TestUser 2",
-        group_primary => "users",
+        group_primary => "root",
         shell => "/bin/sh",
         uid => "54321";
   vars:
       # simple filters
-      "simple_filter" slist => { "name=root" };
-      "number_filter" slist => { "uid=0" };
+      "simple_filter" slist => { "name=testu1" };
+      "number_filter" slist => { "uid=12345" };
 
       # longer filters
-      "slist_filter" slist => { "gid=0", "name=root" };
+      "slist_filter" slist => { "gid=0", "name=testu1" };
 
       # using data
-      "data_filter" data => '[ "gid=0", "name=root" ]';
+      "data_filter" data => '[ "gid=0", "name=testu1" ]';
 
       # using regex
-      "simple_regex" slist => { "name=test_user.*" };
+      "simple_regex" slist => { "name=testu.*" };
       "number_regex" slist => { "uid=1234.*" };
-      "longer_regex" slist => { "name=test_user.*", "uid=1.*" };
+      "longer_regex" slist => { "name=testu.*", "uid=1.*" };
 
       # non-existent user
       "unknown" slist => { "name=thisuserdoesntexist" };
 }
 bundle agent test 
 {
-  meta:
-      "test_soft_fail" string => "windows|aix|solaris|hpux|redhat_10",
-        comment => "RedHat 10 root user is named 'Super User' not 'root'",
-        meta => { "CFE-2318" };
-
   vars:
     "ulist1" data => findlocalusers("@(init.simple_filter)");
     "ulist2" data => findlocalusers("init.number_filter");

tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf.expected.json

@@ -1,70 +1,70 @@
 {
   "ulist1": {
-    "root": {
-      "dir": "/root",
-      "gecos": "root",
+    "testu1": {
+      "dir": "/tmp/test_folder1",
+      "gecos": "TestUser 1",
       "gid": 0,
-      "shell": "/bin/bash",
-      "uid": 0
+      "shell": "/bin/sh",
+      "uid": 12345
     }
   },
   "ulist2": {
-    "root": {
-      "dir": "/root",
-      "gecos": "root",
+    "testu1": {
+      "dir": "/tmp/test_folder1",
+      "gecos": "TestUser 1",
       "gid": 0,
-      "shell": "/bin/bash",
-      "uid": 0
+      "shell": "/bin/sh",
+      "uid": 12345
     }
   },
   "ulist3": {
-    "root": {
-      "dir": "/root",
-      "gecos": "root",
+    "testu1": {
+      "dir": "/tmp/test_folder1",
+      "gecos": "TestUser 1",
       "gid": 0,
-      "shell": "/bin/bash",
-      "uid": 0
+      "shell": "/bin/sh",
+      "uid": 12345
     }
   },
   "ulist4": {
-    "root": {
-      "dir": "/root",
-      "gecos": "root",
+    "testu1": {
+      "dir": "/tmp/test_folder1",
+      "gecos": "TestUser 1",
       "gid": 0,
-      "shell": "/bin/bash",
-      "uid": 0
+      "shell": "/bin/sh",
+      "uid": 12345
     }
   },
   "ulist5": {
-    "test_user1": {
+    "testu1": {
       "dir": "/tmp/test_folder1",
       "gecos": "TestUser 1",
-      "gid": 100,
+      "gid": 0,
       "shell": "/bin/sh",
       "uid": 12345
     },
-    "test_user2": {
+    "testu2": {
       "dir": "/tmp/test_folder2",
       "gecos": "TestUser 2",
-      "gid": 100,
+      "gid": 0,
       "shell": "/bin/sh",
       "uid": 54321
     }
   },
   "ulist6": {
-    "test_user1": {
+    "testu1": {
       "dir": "/tmp/test_folder1",
       "gecos": "TestUser 1",
-      "gid": 100,
+      "gid": 0,
       "shell": "/bin/sh",
       "uid": 12345
     }
   },
   "ulist7": {
-    "test_user1": {
+    "testu1": {
       "dir": "/tmp/test_folder1",
       "gecos": "TestUser 1",
-      "gid": 100,
+      "gid": 0,
       "shell": "/bin/sh",
       "uid": 12345
     }