From 24378fd9449211f73e7ba2ba4cbbf18ab2f59b1a Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sun, 9 Apr 2023 15:10:11 +0200
Subject: [PATCH] [PR #6304/08f14f3e backport][stable-6] pids tests: 'some-' is
 not that a unique pattern. (#6306)

pids tests: 'some-' is not that a unique pattern. (#6304)

* 'some-' is not that a unique pattern.

* Add debugging help.

* Avoid passing the name as a parameter to obtainpid.sh.

(cherry picked from commit 08f14f3eb0e8200a6dd40323c86256d059bcae1e)

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 tests/integration/targets/pids/tasks/main.yml | 24 ++++++++++++-------
 .../pids/{files => templates}/obtainpid.sh    |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)
 rename tests/integration/targets/pids/{files => templates}/obtainpid.sh (68%)

diff --git a/tests/integration/targets/pids/tasks/main.yml b/tests/integration/targets/pids/tasks/main.yml
index ce7e221a0a..2ba7f37547 100644
--- a/tests/integration/targets/pids/tasks/main.yml
+++ b/tests/integration/targets/pids/tasks/main.yml
@@ -32,7 +32,7 @@
 
 - name: "Picking a random process name"
   set_fact:
-    random_name: some-random-long-name-{{ 99999999 | random }}
+    random_name: some-random-long-name-{{ 10000000000 + (9999999999 | random) }}
 
 - name: Copy the fake 'sleep' source code
   copy:
@@ -43,15 +43,14 @@
 - name: Compile fake 'sleep' binary
   command: cc {{ remote_tmp_dir }}/sleeper.c -o {{ remote_tmp_dir }}/{{ random_name }}
 
-- name: Copy helper script
-  copy:
+- name: Copy templated helper script
+  template:
     src: obtainpid.sh
     dest: "{{ remote_tmp_dir }}/obtainpid.sh"
     mode: 0755
 
 - name: "Run the fake 'sleep' binary"
-  command: "sh {{ remote_tmp_dir }}/obtainpid.sh '{{ remote_tmp_dir }}/{{ random_name }}' '{{ remote_tmp_dir }}/obtainpid.txt'"
-
+  command: sh {{ remote_tmp_dir }}/obtainpid.sh
   async: 100
   poll: 0
 
@@ -66,17 +65,17 @@
 
 - name: "Checking that exact non-substring matches are required"
   pids:
-    name: "{{ random_name[0:5] }}"
+    name: "{{ random_name[0:25] }}"
   register: exactpidmatch
 
 - name: "Checking that patterns can be used with the pattern option"
   pids:
-    pattern: "{{ random_name[0:5] }}"
+    pattern: "{{ random_name[0:25] }}"
   register: pattern_pid_match
 
 - name: "Checking that case-insensitive patterns can be used with the pattern option"
   pids:
-    pattern: "{{ random_name[0:5] | upper }}"
+    pattern: "{{ random_name[0:25] | upper }}"
     ignore_case: true
   register: caseinsensitive_pattern_pid_match
 
@@ -90,6 +89,15 @@
     src:  "{{ remote_tmp_dir }}/obtainpid.txt"
   register: newpid
 
+- name: Gather all processes to make debugging easier
+  command: ps aux
+  register: result
+  no_log: true
+
+- name: List all processes to make debugging easier
+  debug:
+    var: result.stdout_lines
+
 - name: "Verify that the Process IDs (PIDs) returned is not empty and also equal to the PIDs obtained in console"
   assert:
     that:
diff --git a/tests/integration/targets/pids/files/obtainpid.sh b/tests/integration/targets/pids/templates/obtainpid.sh
similarity index 68%
rename from tests/integration/targets/pids/files/obtainpid.sh
rename to tests/integration/targets/pids/templates/obtainpid.sh
index 1090f87786..ecbf56aabe 100644
--- a/tests/integration/targets/pids/files/obtainpid.sh
+++ b/tests/integration/targets/pids/templates/obtainpid.sh
@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-"$1" 100 &
-echo "$!" > "$2"
+"{{ remote_tmp_dir }}/{{ random_name }}" 100 &
+echo "$!" > "{{ remote_tmp_dir }}/obtainpid.txt"