From a941b5237003cb6ba338c4ae4f90bef1ef631cf4 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Jul 2018 12:01:27 +1000
Subject: [PATCH 1/2] ctdb-tests: Simplify pstree output in eventd unit tests

pstree truncates output when it exceeds a maximum width - the default
is 132 columns.  A couple of recent
commits (12fd8d7a5c5d14d403aac6cd9e318afcd0a8e159,
b23f3f996038626f618c5b5aa552686c1b852f44) lengthened the command
string in the output so that it is more likely to exceed this limit
and be truncated, as below:

==================================================
Running "cat /memdisk/autobuild/fl/b1851760/ctdb/ctdb/tests/var/eventd/debug_script.log"
--------------------------------------------------
Output (Exit status: 0):
--------------------------------------------------
02.enabled.scri,PID /memdisk/autobuild/fl/b1851760/ctdb/ctdb/tests/var/eventd/events/random/02.enabled.script ...
  `-sleep,PID 99
01.disabled          DISABLED
02.enabled           TIMEDOUT   DATETIME
  OUTPUT: Sleeping for 99 seconds
--------------------------------------------------
Required output (Exit status: 0):
--------------------------------------------------
02.enabled.scri,PID /memdisk/autobuild/fl/b1851760/ctdb/ctdb/tests/var/eventd/events/random/02.enabled.script verbosetimeout
  `-sleep,PID 99
01.disabled          DISABLED
02.enabled           TIMEDOUT   DATETIME
  OUTPUT: Sleeping for 99 seconds

FAILED

It isn't clear that the above example exceeds 132 characters, given
that the PID has been filtered into a fixed string, but it certainly
goes close.  Whether or not it is truncated probably depends on the
width of the PID in the unfiltered output.  This would explain why the
test flaps.

Avoid the output truncation by dropping the -a and -p options to
simplify the pstree output.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13531

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

(cherry picked from commit da115efd2b89e10767e9bec7343dce65ffd3c68b)
---
 ctdb/tests/eventd/etc-ctdb/debug-script.sh | 2 +-
 ctdb/tests/eventd/eventd_022.sh            | 3 +--
 ctdb/tests/eventd/eventd_024.sh            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ctdb/tests/eventd/etc-ctdb/debug-script.sh b/ctdb/tests/eventd/etc-ctdb/debug-script.sh
index 04618cf92f8..47c75a78622 100755
--- a/ctdb/tests/eventd/etc-ctdb/debug-script.sh
+++ b/ctdb/tests/eventd/etc-ctdb/debug-script.sh
@@ -8,7 +8,7 @@ case "$2" in
 	;;
 
 "verbosetimeout")
-	(pstree -p -a $1 ; ctdb-event status random $2) > "$log"
+	(pstree $1 ; ctdb-event status random $2) > "$log"
 	;;
 
 "verbosetimeout2")
diff --git a/ctdb/tests/eventd/eventd_022.sh b/ctdb/tests/eventd/eventd_022.sh
index b71f7c3d885..dc9455aec18 100755
--- a/ctdb/tests/eventd/eventd_022.sh
+++ b/ctdb/tests/eventd/eventd_022.sh
@@ -15,8 +15,7 @@ simple_test run 5 random verbosetimeout
 sleep 5
 
 ok <<EOF
-02.enabled.scri,PID $eventd_scriptdir/random/02.enabled.script verbosetimeout
-  \`-sleep,PID 99
+02.enabled.scri---sleep
 01.disabled          DISABLED  
 02.enabled           TIMEDOUT   DATETIME
   OUTPUT: Sleeping for 99 seconds
diff --git a/ctdb/tests/eventd/eventd_024.sh b/ctdb/tests/eventd/eventd_024.sh
index a76681ea65a..10016a1e2de 100755
--- a/ctdb/tests/eventd/eventd_024.sh
+++ b/ctdb/tests/eventd/eventd_024.sh
@@ -28,4 +28,4 @@ unit_test cat "${CTDB_BASE}/debug_script.log"
 pid=$(cat "${CTDB_BASE}/debug_script.log" | awk '{print $2}')
 
 ok_null
-unit_test pstree -p -a "$pid"
+unit_test pstree "$pid"
-- 
2.17.1


From 8f1ace78e0068ecb0c64552ff0360f50fcc06c6c Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Jul 2018 15:24:05 +1000
Subject: [PATCH 2/2] ctdb-tests: Loosen match against pstree output in simple
 test

As per previous commit, pstree can truncate output if it gets too
wide.  Instead of matching against the script's full path and
arguments, just match against the script name.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13531

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Jul 18 14:53:39 CEST 2018 on sn-devel-144

(cherry picked from commit 359e52187fbc9b5f94570ff8d12607b4fc42e4f2)
---
 ctdb/tests/simple/90_debug_hung_script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctdb/tests/simple/90_debug_hung_script.sh b/ctdb/tests/simple/90_debug_hung_script.sh
index b605dc02fd4..846188fc716 100755
--- a/ctdb/tests/simple/90_debug_hung_script.sh
+++ b/ctdb/tests/simple/90_debug_hung_script.sh
@@ -73,7 +73,7 @@ done <<EOF
 ===== Start of hung script debug for PID=".*", event="monitor" =====
 ===== End of hung script debug for PID=".*", event="monitor" =====
 pstree -p -a .*:
-00\\\\.test\\\\.script,.* ${ctdb_base}/events/legacy/00\\\\.test\\\\.script monitor
+00\\\\.test\\\\.script,.*
  *\`-sleep,.*
 ---- Stack trace of interesting process [0-9]*\\\\[sleep\\\\] ----
 [<[0-9a-f]*>] .*sleep+.*
-- 
2.17.1