From 1c8c0be6f97f74169c0b46be4df2245aa631186a Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 24 Sep 2014 17:07:12 +1000
Subject: [PATCH] ctdb-tests: Make the fake log timestamp string easy to modify

Use a variable to allow easy change of this string in case future
logging changes modify the timestamp format or do not support
timestamping.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
---
 ctdb/tests/scripts/unit.sh                    |   1 +
 ctdb/tests/takeover/det.001.sh                |  14 +-
 ctdb/tests/takeover/det.002.sh                |   8 +-
 ctdb/tests/takeover/det.003.sh                |   2 +-
 ctdb/tests/takeover/lcp2.004.sh               |  12 +-
 ctdb/tests/takeover/lcp2.005.sh               | 396 +++++++++++++-------------
 ctdb/tests/takeover/lcp2.023.sh               | 194 ++++++-------
 ctdb/tests/takeover/lcp2.024.sh               |  18 +-
 ctdb/tests/takeover/lcp2.029.sh               |   6 +-
 ctdb/tests/takeover/lcp2.031.sh               | 286 +++++++++----------
 ctdb/tests/takeover/nondet.001.sh             |  12 +-
 ctdb/tests/takeover/nondet.002.sh             |   6 +-
 ctdb/tests/tool/func.parse_nodestring.003.sh  |   2 +-
 ctdb/tests/tool/stubby.getcapabilities.003.sh |   2 +-
 ctdb/tests/tool/stubby.listnodes.001.sh       |   2 +-
 ctdb/tests/tool/stubby.lvsmaster.002.sh       |   2 +-
 ctdb/tests/tool/stubby.natgwlist.009.sh       |   8 +-
 ctdb/tests/tool/stubby.xpnn.003.sh            |   2 +-
 18 files changed, 487 insertions(+), 486 deletions(-)
 rewrite ctdb/tests/takeover/lcp2.005.sh (94%)
 rewrite ctdb/tests/takeover/lcp2.023.sh (87%)
 rewrite ctdb/tests/takeover/lcp2.031.sh (87%)

diff --git a/ctdb/tests/scripts/unit.sh b/ctdb/tests/scripts/unit.sh
index afa0c1f538d..4eccada48df 100644
--- a/ctdb/tests/scripts/unit.sh
+++ b/ctdb/tests/scripts/unit.sh
@@ -124,6 +124,7 @@ result_filter_default ()
     _date_time_pid='[0-9/][0-9/]*\ [0-9:\.][0-9:\.]*\ \[[\ 0-9][\ 0-9]*\]'
     sed -e "s@^${_date_time_pid}:@DATE\ TIME\ \[PID\]:@"
 }
+TEST_DATE_STAMP="DATE TIME [PID]: "
 
 # Override this function to customise output filtering.
 result_filter ()
diff --git a/ctdb/tests/takeover/det.001.sh b/ctdb/tests/takeover/det.001.sh
index 2387f12fb93..ead8f211b0d 100755
--- a/ctdb/tests/takeover/det.001.sh
+++ b/ctdb/tests/takeover/det.001.sh
@@ -5,13 +5,13 @@
 define_test "3 nodes, 1 healthy"
 
 required_result <<EOF
-DATE TIME [PID]: Deterministic IPs enabled. Resetting all ip allocations
-DATE TIME [PID]: Unassign IP: 192.168.21.254 from 0
-DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.254 from 0
-DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.251 from 0
-DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
+${TEST_DATE_STAMP}Deterministic IPs enabled. Resetting all ip allocations
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.254 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.254 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.251 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.250 from 1
 192.168.21.254 2
 192.168.21.253 2
 192.168.21.252 2
diff --git a/ctdb/tests/takeover/det.002.sh b/ctdb/tests/takeover/det.002.sh
index 21fbaec316a..c411d144497 100755
--- a/ctdb/tests/takeover/det.002.sh
+++ b/ctdb/tests/takeover/det.002.sh
@@ -5,10 +5,10 @@
 define_test "3 nodes, 2 healthy"
 
 required_result <<EOF
-DATE TIME [PID]: Deterministic IPs enabled. Resetting all ip allocations
-DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
+${TEST_DATE_STAMP}Deterministic IPs enabled. Resetting all ip allocations
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.250 from 1
 192.168.21.254 0
 192.168.21.253 0
 192.168.21.252 2
diff --git a/ctdb/tests/takeover/det.003.sh b/ctdb/tests/takeover/det.003.sh
index 3666047217a..b40e2183b94 100755
--- a/ctdb/tests/takeover/det.003.sh
+++ b/ctdb/tests/takeover/det.003.sh
@@ -5,7 +5,7 @@
 define_test "3 nodes, 1 -> all healthy"
 
 required_result <<EOF
-DATE TIME [PID]: Deterministic IPs enabled. Resetting all ip allocations
+${TEST_DATE_STAMP}Deterministic IPs enabled. Resetting all ip allocations
 192.168.21.254 0
 192.168.21.253 1
 192.168.21.252 2
diff --git a/ctdb/tests/takeover/lcp2.004.sh b/ctdb/tests/takeover/lcp2.004.sh
index c067184d383..e8bfb292b02 100755
--- a/ctdb/tests/takeover/lcp2.004.sh
+++ b/ctdb/tests/takeover/lcp2.004.sh
@@ -7,12 +7,12 @@ define_test "3 nodes, 1 -> all healthy, info logging"
 export CTDB_TEST_LOGLEVEL=3
 
 required_result <<EOF
-DATE TIME [PID]: 1 [-121363] -> 192.168.20.253 -> 0 [+0]
-DATE TIME [PID]: 1 [-105738] -> 192.168.20.251 -> 2 [+0]
-DATE TIME [PID]: 1 [-88649] -> 192.168.21.253 -> 0 [+14161]
-DATE TIME [PID]: 1 [-75448] -> 192.168.20.254 -> 2 [+15625]
-DATE TIME [PID]: 1 [-59823] -> 192.168.20.250 -> 0 [+29786]
-DATE TIME [PID]: 1 [-44198] -> 192.168.21.254 -> 2 [+28322]
+${TEST_DATE_STAMP}1 [-121363] -> 192.168.20.253 -> 0 [+0]
+${TEST_DATE_STAMP}1 [-105738] -> 192.168.20.251 -> 2 [+0]
+${TEST_DATE_STAMP}1 [-88649] -> 192.168.21.253 -> 0 [+14161]
+${TEST_DATE_STAMP}1 [-75448] -> 192.168.20.254 -> 2 [+15625]
+${TEST_DATE_STAMP}1 [-59823] -> 192.168.20.250 -> 0 [+29786]
+${TEST_DATE_STAMP}1 [-44198] -> 192.168.21.254 -> 2 [+28322]
 192.168.21.254 2
 192.168.21.253 0
 192.168.21.252 1
diff --git a/ctdb/tests/takeover/lcp2.005.sh b/ctdb/tests/takeover/lcp2.005.sh
dissimilarity index 94%
index 4e0bed850a0..2ac56523043 100755
--- a/ctdb/tests/takeover/lcp2.005.sh
+++ b/ctdb/tests/takeover/lcp2.005.sh
@@ -1,198 +1,198 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "3 nodes, 1 -> all healthy, debug logging"
-
-export CTDB_TEST_LOGLEVEL=4
-
-required_result <<EOF
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES (UNASSIGNED)
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [0]
-DATE TIME [PID]:  1 [539166]
-DATE TIME [PID]:  2 [0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [539166]
-DATE TIME [PID]:  1 [-116718] -> 192.168.21.254 -> 0 [+0]
-DATE TIME [PID]:  1 [-116718] -> 192.168.21.254 -> 2 [+0]
-DATE TIME [PID]:  1 [-116971] -> 192.168.21.253 -> 0 [+0]
-DATE TIME [PID]:  1 [-116971] -> 192.168.21.253 -> 2 [+0]
-DATE TIME [PID]:  1 [-116971] -> 192.168.21.252 -> 0 [+0]
-DATE TIME [PID]:  1 [-116971] -> 192.168.21.252 -> 2 [+0]
-DATE TIME [PID]:  1 [-121110] -> 192.168.20.254 -> 0 [+0]
-DATE TIME [PID]:  1 [-121110] -> 192.168.20.254 -> 2 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.253 -> 0 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.253 -> 2 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.252 -> 0 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.252 -> 2 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.251 -> 0 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.251 -> 2 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.250 -> 0 [+0]
-DATE TIME [PID]:  1 [-121363] -> 192.168.20.250 -> 2 [+0]
-DATE TIME [PID]:  1 [-121110] -> 192.168.20.249 -> 0 [+0]
-DATE TIME [PID]:  1 [-121110] -> 192.168.20.249 -> 2 [+0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-121363] -> 192.168.20.253 -> 0 [+0]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [0]
-DATE TIME [PID]:  1 [417803]
-DATE TIME [PID]:  2 [0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [417803]
-DATE TIME [PID]:  1 [-102557] -> 192.168.21.254 -> 0 [+14161]
-DATE TIME [PID]:  1 [-102557] -> 192.168.21.254 -> 2 [+0]
-DATE TIME [PID]:  1 [-102810] -> 192.168.21.253 -> 0 [+14161]
-DATE TIME [PID]:  1 [-102810] -> 192.168.21.253 -> 2 [+0]
-DATE TIME [PID]:  1 [-102810] -> 192.168.21.252 -> 0 [+14161]
-DATE TIME [PID]:  1 [-102810] -> 192.168.21.252 -> 2 [+0]
-DATE TIME [PID]:  1 [-105234] -> 192.168.20.254 -> 0 [+15876]
-DATE TIME [PID]:  1 [-105234] -> 192.168.20.254 -> 2 [+0]
-DATE TIME [PID]:  1 [-105234] -> 192.168.20.252 -> 0 [+16129]
-DATE TIME [PID]:  1 [-105234] -> 192.168.20.252 -> 2 [+0]
-DATE TIME [PID]:  1 [-105738] -> 192.168.20.251 -> 0 [+15625]
-DATE TIME [PID]:  1 [-105738] -> 192.168.20.251 -> 2 [+0]
-DATE TIME [PID]:  1 [-105738] -> 192.168.20.250 -> 0 [+15625]
-DATE TIME [PID]:  1 [-105738] -> 192.168.20.250 -> 2 [+0]
-DATE TIME [PID]:  1 [-105485] -> 192.168.20.249 -> 0 [+15625]
-DATE TIME [PID]:  1 [-105485] -> 192.168.20.249 -> 2 [+0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-105738] -> 192.168.20.251 -> 2 [+0]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [0]
-DATE TIME [PID]:  1 [312065]
-DATE TIME [PID]:  2 [0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [312065]
-DATE TIME [PID]:  1 [-88396] -> 192.168.21.254 -> 0 [+14161]
-DATE TIME [PID]:  1 [-88396] -> 192.168.21.254 -> 2 [+14161]
-DATE TIME [PID]:  1 [-88649] -> 192.168.21.253 -> 0 [+14161]
-DATE TIME [PID]:  1 [-88649] -> 192.168.21.253 -> 2 [+14161]
-DATE TIME [PID]:  1 [-88649] -> 192.168.21.252 -> 0 [+14161]
-DATE TIME [PID]:  1 [-88649] -> 192.168.21.252 -> 2 [+14161]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.254 -> 0 [+15876]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.254 -> 2 [+15625]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.252 -> 0 [+16129]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.252 -> 2 [+15625]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.250 -> 0 [+15625]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.250 -> 2 [+16129]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.249 -> 0 [+15625]
-DATE TIME [PID]:  1 [-89609] -> 192.168.20.249 -> 2 [+15876]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-88649] -> 192.168.21.253 -> 0 [+14161]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [14161]
-DATE TIME [PID]:  1 [223416]
-DATE TIME [PID]:  2 [0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [223416]
-DATE TIME [PID]:  1 [-72520] -> 192.168.21.254 -> 0 [+30037]
-DATE TIME [PID]:  1 [-72520] -> 192.168.21.254 -> 2 [+14161]
-DATE TIME [PID]:  1 [-72520] -> 192.168.21.252 -> 0 [+30290]
-DATE TIME [PID]:  1 [-72520] -> 192.168.21.252 -> 2 [+14161]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.254 -> 0 [+30037]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.254 -> 2 [+15625]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.252 -> 0 [+30290]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.252 -> 2 [+15625]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.250 -> 0 [+29786]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.250 -> 2 [+16129]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.249 -> 0 [+29786]
-DATE TIME [PID]:  1 [-75448] -> 192.168.20.249 -> 2 [+15876]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-75448] -> 192.168.20.254 -> 2 [+15625]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [14161]
-DATE TIME [PID]:  1 [147968]
-DATE TIME [PID]:  2 [15625]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [147968]
-DATE TIME [PID]:  1 [-58359] -> 192.168.21.254 -> 0 [+30037]
-DATE TIME [PID]:  1 [-58359] -> 192.168.21.254 -> 2 [+28322]
-DATE TIME [PID]:  1 [-58359] -> 192.168.21.252 -> 0 [+30290]
-DATE TIME [PID]:  1 [-58359] -> 192.168.21.252 -> 2 [+28322]
-DATE TIME [PID]:  1 [-59572] -> 192.168.20.252 -> 0 [+30290]
-DATE TIME [PID]:  1 [-59572] -> 192.168.20.252 -> 2 [+31501]
-DATE TIME [PID]:  1 [-59823] -> 192.168.20.250 -> 0 [+29786]
-DATE TIME [PID]:  1 [-59823] -> 192.168.20.250 -> 2 [+31754]
-DATE TIME [PID]:  1 [-59823] -> 192.168.20.249 -> 0 [+29786]
-DATE TIME [PID]:  1 [-59823] -> 192.168.20.249 -> 2 [+31501]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-59823] -> 192.168.20.250 -> 0 [+29786]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [43947]
-DATE TIME [PID]:  1 [88145]
-DATE TIME [PID]:  2 [15625]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [88145]
-DATE TIME [PID]:  1 [-44198] -> 192.168.21.254 -> 0 [+44198]
-DATE TIME [PID]:  1 [-44198] -> 192.168.21.254 -> 2 [+28322]
-DATE TIME [PID]:  1 [-44198] -> 192.168.21.252 -> 0 [+44451]
-DATE TIME [PID]:  1 [-44198] -> 192.168.21.252 -> 2 [+28322]
-DATE TIME [PID]:  1 [-43947] -> 192.168.20.252 -> 0 [+45915]
-DATE TIME [PID]:  1 [-43947] -> 192.168.20.252 -> 2 [+31501]
-DATE TIME [PID]:  1 [-43947] -> 192.168.20.249 -> 0 [+45662]
-DATE TIME [PID]:  1 [-43947] -> 192.168.20.249 -> 2 [+31501]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-44198] -> 192.168.21.254 -> 2 [+28322]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [43947]
-DATE TIME [PID]:  1 [43947]
-DATE TIME [PID]:  2 [43947]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 0 [43947]
-DATE TIME [PID]:  0 [-28322] -> 192.168.21.253 -> 0 [+28322]
-DATE TIME [PID]:  0 [-28322] -> 192.168.21.253 -> 2 [+44198]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.253 -> 0 [+29786]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.253 -> 2 [+45662]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.250 -> 0 [+29786]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.250 -> 2 [+45915]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [43947]
-DATE TIME [PID]:  1 [-28322] -> 192.168.21.252 -> 0 [+44451]
-DATE TIME [PID]:  1 [-28322] -> 192.168.21.252 -> 2 [+44198]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.252 -> 0 [+45915]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.252 -> 2 [+45662]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.249 -> 0 [+45662]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.249 -> 2 [+45662]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [43947]
-DATE TIME [PID]:  2 [-28322] -> 192.168.21.254 -> 0 [+44198]
-DATE TIME [PID]:  2 [-28322] -> 192.168.21.254 -> 2 [+28322]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.254 -> 0 [+45662]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.254 -> 2 [+29786]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.251 -> 0 [+45915]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.251 -> 2 [+29786]
-DATE TIME [PID]:  ----------------------------------------
-192.168.21.254 2
-192.168.21.253 0
-192.168.21.252 1
-192.168.20.254 2
-192.168.20.253 0
-192.168.20.252 1
-192.168.20.251 2
-192.168.20.250 0
-192.168.20.249 1
-EOF
-
-simple_test 0,0,0 <<EOF
-192.168.20.249 1
-192.168.20.250 1
-192.168.20.251 1
-192.168.20.252 1
-192.168.20.253 1
-192.168.20.254 1
-192.168.21.252 1
-192.168.21.253 1
-192.168.21.254 1
-EOF
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, 1 -> all healthy, debug logging"
+
+export CTDB_TEST_LOGLEVEL=4
+
+required_result <<EOF
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES (UNASSIGNED)
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [0]
+${TEST_DATE_STAMP} 1 [539166]
+${TEST_DATE_STAMP} 2 [0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [539166]
+${TEST_DATE_STAMP} 1 [-116718] -> 192.168.21.254 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-116718] -> 192.168.21.254 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-116971] -> 192.168.21.253 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-116971] -> 192.168.21.253 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-116971] -> 192.168.21.252 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-116971] -> 192.168.21.252 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121110] -> 192.168.20.254 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121110] -> 192.168.20.254 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.253 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.253 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.252 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.252 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.251 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.251 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.250 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121363] -> 192.168.20.250 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-121110] -> 192.168.20.249 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-121110] -> 192.168.20.249 -> 2 [+0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-121363] -> 192.168.20.253 -> 0 [+0]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [0]
+${TEST_DATE_STAMP} 1 [417803]
+${TEST_DATE_STAMP} 2 [0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [417803]
+${TEST_DATE_STAMP} 1 [-102557] -> 192.168.21.254 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-102557] -> 192.168.21.254 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-102810] -> 192.168.21.253 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-102810] -> 192.168.21.253 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-102810] -> 192.168.21.252 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-102810] -> 192.168.21.252 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-105234] -> 192.168.20.254 -> 0 [+15876]
+${TEST_DATE_STAMP} 1 [-105234] -> 192.168.20.254 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-105234] -> 192.168.20.252 -> 0 [+16129]
+${TEST_DATE_STAMP} 1 [-105234] -> 192.168.20.252 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-105738] -> 192.168.20.251 -> 0 [+15625]
+${TEST_DATE_STAMP} 1 [-105738] -> 192.168.20.251 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-105738] -> 192.168.20.250 -> 0 [+15625]
+${TEST_DATE_STAMP} 1 [-105738] -> 192.168.20.250 -> 2 [+0]
+${TEST_DATE_STAMP} 1 [-105485] -> 192.168.20.249 -> 0 [+15625]
+${TEST_DATE_STAMP} 1 [-105485] -> 192.168.20.249 -> 2 [+0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-105738] -> 192.168.20.251 -> 2 [+0]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [0]
+${TEST_DATE_STAMP} 1 [312065]
+${TEST_DATE_STAMP} 2 [0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [312065]
+${TEST_DATE_STAMP} 1 [-88396] -> 192.168.21.254 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-88396] -> 192.168.21.254 -> 2 [+14161]
+${TEST_DATE_STAMP} 1 [-88649] -> 192.168.21.253 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-88649] -> 192.168.21.253 -> 2 [+14161]
+${TEST_DATE_STAMP} 1 [-88649] -> 192.168.21.252 -> 0 [+14161]
+${TEST_DATE_STAMP} 1 [-88649] -> 192.168.21.252 -> 2 [+14161]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.254 -> 0 [+15876]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.254 -> 2 [+15625]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.252 -> 0 [+16129]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.252 -> 2 [+15625]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.250 -> 0 [+15625]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.250 -> 2 [+16129]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.249 -> 0 [+15625]
+${TEST_DATE_STAMP} 1 [-89609] -> 192.168.20.249 -> 2 [+15876]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-88649] -> 192.168.21.253 -> 0 [+14161]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [14161]
+${TEST_DATE_STAMP} 1 [223416]
+${TEST_DATE_STAMP} 2 [0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [223416]
+${TEST_DATE_STAMP} 1 [-72520] -> 192.168.21.254 -> 0 [+30037]
+${TEST_DATE_STAMP} 1 [-72520] -> 192.168.21.254 -> 2 [+14161]
+${TEST_DATE_STAMP} 1 [-72520] -> 192.168.21.252 -> 0 [+30290]
+${TEST_DATE_STAMP} 1 [-72520] -> 192.168.21.252 -> 2 [+14161]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.254 -> 0 [+30037]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.254 -> 2 [+15625]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.252 -> 0 [+30290]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.252 -> 2 [+15625]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.250 -> 0 [+29786]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.250 -> 2 [+16129]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.249 -> 0 [+29786]
+${TEST_DATE_STAMP} 1 [-75448] -> 192.168.20.249 -> 2 [+15876]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-75448] -> 192.168.20.254 -> 2 [+15625]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [14161]
+${TEST_DATE_STAMP} 1 [147968]
+${TEST_DATE_STAMP} 2 [15625]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [147968]
+${TEST_DATE_STAMP} 1 [-58359] -> 192.168.21.254 -> 0 [+30037]
+${TEST_DATE_STAMP} 1 [-58359] -> 192.168.21.254 -> 2 [+28322]
+${TEST_DATE_STAMP} 1 [-58359] -> 192.168.21.252 -> 0 [+30290]
+${TEST_DATE_STAMP} 1 [-58359] -> 192.168.21.252 -> 2 [+28322]
+${TEST_DATE_STAMP} 1 [-59572] -> 192.168.20.252 -> 0 [+30290]
+${TEST_DATE_STAMP} 1 [-59572] -> 192.168.20.252 -> 2 [+31501]
+${TEST_DATE_STAMP} 1 [-59823] -> 192.168.20.250 -> 0 [+29786]
+${TEST_DATE_STAMP} 1 [-59823] -> 192.168.20.250 -> 2 [+31754]
+${TEST_DATE_STAMP} 1 [-59823] -> 192.168.20.249 -> 0 [+29786]
+${TEST_DATE_STAMP} 1 [-59823] -> 192.168.20.249 -> 2 [+31501]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-59823] -> 192.168.20.250 -> 0 [+29786]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [43947]
+${TEST_DATE_STAMP} 1 [88145]
+${TEST_DATE_STAMP} 2 [15625]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [88145]
+${TEST_DATE_STAMP} 1 [-44198] -> 192.168.21.254 -> 0 [+44198]
+${TEST_DATE_STAMP} 1 [-44198] -> 192.168.21.254 -> 2 [+28322]
+${TEST_DATE_STAMP} 1 [-44198] -> 192.168.21.252 -> 0 [+44451]
+${TEST_DATE_STAMP} 1 [-44198] -> 192.168.21.252 -> 2 [+28322]
+${TEST_DATE_STAMP} 1 [-43947] -> 192.168.20.252 -> 0 [+45915]
+${TEST_DATE_STAMP} 1 [-43947] -> 192.168.20.252 -> 2 [+31501]
+${TEST_DATE_STAMP} 1 [-43947] -> 192.168.20.249 -> 0 [+45662]
+${TEST_DATE_STAMP} 1 [-43947] -> 192.168.20.249 -> 2 [+31501]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-44198] -> 192.168.21.254 -> 2 [+28322]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [43947]
+${TEST_DATE_STAMP} 1 [43947]
+${TEST_DATE_STAMP} 2 [43947]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 0 [43947]
+${TEST_DATE_STAMP} 0 [-28322] -> 192.168.21.253 -> 0 [+28322]
+${TEST_DATE_STAMP} 0 [-28322] -> 192.168.21.253 -> 2 [+44198]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.253 -> 0 [+29786]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.253 -> 2 [+45662]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.250 -> 0 [+29786]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.250 -> 2 [+45915]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [43947]
+${TEST_DATE_STAMP} 1 [-28322] -> 192.168.21.252 -> 0 [+44451]
+${TEST_DATE_STAMP} 1 [-28322] -> 192.168.21.252 -> 2 [+44198]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.252 -> 0 [+45915]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.252 -> 2 [+45662]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.249 -> 0 [+45662]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.249 -> 2 [+45662]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [43947]
+${TEST_DATE_STAMP} 2 [-28322] -> 192.168.21.254 -> 0 [+44198]
+${TEST_DATE_STAMP} 2 [-28322] -> 192.168.21.254 -> 2 [+28322]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.254 -> 0 [+45662]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.254 -> 2 [+29786]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.251 -> 0 [+45915]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.251 -> 2 [+29786]
+${TEST_DATE_STAMP} ----------------------------------------
+192.168.21.254 2
+192.168.21.253 0
+192.168.21.252 1
+192.168.20.254 2
+192.168.20.253 0
+192.168.20.252 1
+192.168.20.251 2
+192.168.20.250 0
+192.168.20.249 1
+EOF
+
+simple_test 0,0,0 <<EOF
+192.168.20.249 1
+192.168.20.250 1
+192.168.20.251 1
+192.168.20.252 1
+192.168.20.253 1
+192.168.20.254 1
+192.168.21.252 1
+192.168.21.253 1
+192.168.21.254 1
+EOF
diff --git a/ctdb/tests/takeover/lcp2.023.sh b/ctdb/tests/takeover/lcp2.023.sh
dissimilarity index 87%
index 0f35b3ea88d..c29546e849b 100755
--- a/ctdb/tests/takeover/lcp2.023.sh
+++ b/ctdb/tests/takeover/lcp2.023.sh
@@ -1,97 +1,97 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "3 nodes, all IPs assigned, 1->3 unhealthy"
-
-export CTDB_TEST_LOGLEVEL=4
-
-required_result <<EOF
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES (UNASSIGNED)
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [89609]
-DATE TIME [PID]:  1 [0]
-DATE TIME [PID]:  2 [147968]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [147968]
-DATE TIME [PID]:  2 [-58359] -> 192.168.21.254 -> 1 [+0]
-DATE TIME [PID]:  2 [-58359] -> 192.168.21.252 -> 1 [+0]
-DATE TIME [PID]:  2 [-59572] -> 192.168.20.253 -> 1 [+0]
-DATE TIME [PID]:  2 [-59823] -> 192.168.20.251 -> 1 [+0]
-DATE TIME [PID]:  2 [-59823] -> 192.168.20.249 -> 1 [+0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 2 [-59823] -> 192.168.20.251 -> 1 [+0]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [89609]
-DATE TIME [PID]:  1 [0]
-DATE TIME [PID]:  2 [88145]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 0 [89609]
-DATE TIME [PID]:  0 [-42483] -> 192.168.21.253 -> 1 [+14161]
-DATE TIME [PID]:  0 [-45662] -> 192.168.20.254 -> 1 [+15625]
-DATE TIME [PID]:  0 [-45662] -> 192.168.20.252 -> 1 [+15625]
-DATE TIME [PID]:  0 [-45411] -> 192.168.20.250 -> 1 [+16129]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 0 [-45662] -> 192.168.20.254 -> 1 [+15625]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [43947]
-DATE TIME [PID]:  1 [15625]
-DATE TIME [PID]:  2 [88145]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [88145]
-DATE TIME [PID]:  2 [-44198] -> 192.168.21.254 -> 1 [+28322]
-DATE TIME [PID]:  2 [-44198] -> 192.168.21.252 -> 1 [+28322]
-DATE TIME [PID]:  2 [-43947] -> 192.168.20.253 -> 1 [+31501]
-DATE TIME [PID]:  2 [-43947] -> 192.168.20.249 -> 1 [+31501]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 2 [-44198] -> 192.168.21.254 -> 1 [+28322]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [43947]
-DATE TIME [PID]:  1 [43947]
-DATE TIME [PID]:  2 [43947]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 0 [43947]
-DATE TIME [PID]:  0 [-28322] -> 192.168.21.253 -> 1 [+44198]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.252 -> 1 [+45662]
-DATE TIME [PID]:  0 [-29786] -> 192.168.20.250 -> 1 [+45915]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [43947]
-DATE TIME [PID]:  1 [-28322] -> 192.168.21.254 -> 1 [+28322]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.254 -> 1 [+29786]
-DATE TIME [PID]:  1 [-29786] -> 192.168.20.251 -> 1 [+29786]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [43947]
-DATE TIME [PID]:  2 [-28322] -> 192.168.21.252 -> 1 [+44198]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.253 -> 1 [+45662]
-DATE TIME [PID]:  2 [-29786] -> 192.168.20.249 -> 1 [+45662]
-DATE TIME [PID]:  ----------------------------------------
-192.168.21.254 1
-192.168.21.253 0
-192.168.21.252 2
-192.168.20.254 1
-192.168.20.253 2
-192.168.20.252 0
-192.168.20.251 1
-192.168.20.250 0
-192.168.20.249 2
-EOF
-
-simple_test 2,2,2 <<EOF
-192.168.21.254 2
-192.168.21.253 0
-192.168.21.252 2
-192.168.20.254 0
-192.168.20.253 2
-192.168.20.252 0
-192.168.20.251 2
-192.168.20.250 0
-192.168.20.249 2
-EOF
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all IPs assigned, 1->3 unhealthy"
+
+export CTDB_TEST_LOGLEVEL=4
+
+required_result <<EOF
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES (UNASSIGNED)
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [89609]
+${TEST_DATE_STAMP} 1 [0]
+${TEST_DATE_STAMP} 2 [147968]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [147968]
+${TEST_DATE_STAMP} 2 [-58359] -> 192.168.21.254 -> 1 [+0]
+${TEST_DATE_STAMP} 2 [-58359] -> 192.168.21.252 -> 1 [+0]
+${TEST_DATE_STAMP} 2 [-59572] -> 192.168.20.253 -> 1 [+0]
+${TEST_DATE_STAMP} 2 [-59823] -> 192.168.20.251 -> 1 [+0]
+${TEST_DATE_STAMP} 2 [-59823] -> 192.168.20.249 -> 1 [+0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}2 [-59823] -> 192.168.20.251 -> 1 [+0]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [89609]
+${TEST_DATE_STAMP} 1 [0]
+${TEST_DATE_STAMP} 2 [88145]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 0 [89609]
+${TEST_DATE_STAMP} 0 [-42483] -> 192.168.21.253 -> 1 [+14161]
+${TEST_DATE_STAMP} 0 [-45662] -> 192.168.20.254 -> 1 [+15625]
+${TEST_DATE_STAMP} 0 [-45662] -> 192.168.20.252 -> 1 [+15625]
+${TEST_DATE_STAMP} 0 [-45411] -> 192.168.20.250 -> 1 [+16129]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}0 [-45662] -> 192.168.20.254 -> 1 [+15625]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [43947]
+${TEST_DATE_STAMP} 1 [15625]
+${TEST_DATE_STAMP} 2 [88145]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [88145]
+${TEST_DATE_STAMP} 2 [-44198] -> 192.168.21.254 -> 1 [+28322]
+${TEST_DATE_STAMP} 2 [-44198] -> 192.168.21.252 -> 1 [+28322]
+${TEST_DATE_STAMP} 2 [-43947] -> 192.168.20.253 -> 1 [+31501]
+${TEST_DATE_STAMP} 2 [-43947] -> 192.168.20.249 -> 1 [+31501]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}2 [-44198] -> 192.168.21.254 -> 1 [+28322]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [43947]
+${TEST_DATE_STAMP} 1 [43947]
+${TEST_DATE_STAMP} 2 [43947]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 0 [43947]
+${TEST_DATE_STAMP} 0 [-28322] -> 192.168.21.253 -> 1 [+44198]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.252 -> 1 [+45662]
+${TEST_DATE_STAMP} 0 [-29786] -> 192.168.20.250 -> 1 [+45915]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [43947]
+${TEST_DATE_STAMP} 1 [-28322] -> 192.168.21.254 -> 1 [+28322]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.254 -> 1 [+29786]
+${TEST_DATE_STAMP} 1 [-29786] -> 192.168.20.251 -> 1 [+29786]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [43947]
+${TEST_DATE_STAMP} 2 [-28322] -> 192.168.21.252 -> 1 [+44198]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.253 -> 1 [+45662]
+${TEST_DATE_STAMP} 2 [-29786] -> 192.168.20.249 -> 1 [+45662]
+${TEST_DATE_STAMP} ----------------------------------------
+192.168.21.254 1
+192.168.21.253 0
+192.168.21.252 2
+192.168.20.254 1
+192.168.20.253 2
+192.168.20.252 0
+192.168.20.251 1
+192.168.20.250 0
+192.168.20.249 2
+EOF
+
+simple_test 2,2,2 <<EOF
+192.168.21.254 2
+192.168.21.253 0
+192.168.21.252 2
+192.168.20.254 0
+192.168.20.253 2
+192.168.20.252 0
+192.168.20.251 2
+192.168.20.250 0
+192.168.20.249 2
+EOF
diff --git a/ctdb/tests/takeover/lcp2.024.sh b/ctdb/tests/takeover/lcp2.024.sh
index 05095523ed5..f76bc83df41 100755
--- a/ctdb/tests/takeover/lcp2.024.sh
+++ b/ctdb/tests/takeover/lcp2.024.sh
@@ -7,15 +7,15 @@ define_test "3 nodes, no IPs assigned, all healthy, all in STARTUP runstate"
 export CTDB_TEST_LOGLEVEL=2
 
 required_result <<EOF
-DATE TIME [PID]: Failed to find node to cover ip 192.168.21.254
-DATE TIME [PID]: Failed to find node to cover ip 192.168.21.253
-DATE TIME [PID]: Failed to find node to cover ip 192.168.21.252
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.254
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.253
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.252
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.251
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.250
-DATE TIME [PID]: Failed to find node to cover ip 192.168.20.249
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.21.254
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.21.253
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.21.252
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.254
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.253
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.252
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.251
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.250
+${TEST_DATE_STAMP}Failed to find node to cover ip 192.168.20.249
 192.168.21.254 -1
 192.168.21.253 -1
 192.168.21.252 -1
diff --git a/ctdb/tests/takeover/lcp2.029.sh b/ctdb/tests/takeover/lcp2.029.sh
index d3c817f0c53..fe4d2465279 100755
--- a/ctdb/tests/takeover/lcp2.029.sh
+++ b/ctdb/tests/takeover/lcp2.029.sh
@@ -7,9 +7,9 @@ define_test "4 nodes, some IPs unassigned on target nodes"
 export CTDB_TEST_LOGLEVEL=3
 
 required_result <<EOF
-DATE TIME [PID]:  10.19.99.251 -> 2 [+9216]
-DATE TIME [PID]:  130.216.30.173 -> 2 [+24345]
-DATE TIME [PID]:  130.216.30.171 -> 2 [+39970]
+${TEST_DATE_STAMP} 10.19.99.251 -> 2 [+9216]
+${TEST_DATE_STAMP} 130.216.30.173 -> 2 [+24345]
+${TEST_DATE_STAMP} 130.216.30.171 -> 2 [+39970]
 130.216.30.181 0
 130.216.30.180 1
 130.216.30.179 2
diff --git a/ctdb/tests/takeover/lcp2.031.sh b/ctdb/tests/takeover/lcp2.031.sh
dissimilarity index 87%
index 6c5acf91ffa..be10866f531 100755
--- a/ctdb/tests/takeover/lcp2.031.sh
+++ b/ctdb/tests/takeover/lcp2.031.sh
@@ -1,143 +1,143 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "12+4 IPs, 4 nodes, 3 -> 4 healthy"
-
-export CTDB_TEST_LOGLEVEL=4
-
-required_result <<EOF
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES (UNASSIGNED)
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [0]
-DATE TIME [PID]:  1 [181370]
-DATE TIME [PID]:  2 [128630]
-DATE TIME [PID]:  3 [128881]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [181370]
-DATE TIME [PID]:  1 [-64566] -> 130.216.30.178 -> 0 [+0]
-DATE TIME [PID]:  1 [-64566] -> 130.216.30.176 -> 0 [+0]
-DATE TIME [PID]:  1 [-64315] -> 130.216.30.175 -> 0 [+0]
-DATE TIME [PID]:  1 [-64315] -> 130.216.30.171 -> 0 [+0]
-DATE TIME [PID]:  1 [-52489] -> 10.19.99.253 -> 0 [+0]
-DATE TIME [PID]:  1 [-52489] -> 10.19.99.250 -> 0 [+0]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-64566] -> 130.216.30.178 -> 0 [+0]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [0]
-DATE TIME [PID]:  1 [116804]
-DATE TIME [PID]:  2 [128630]
-DATE TIME [PID]:  3 [128881]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 3 [128881]
-DATE TIME [PID]:  3 [-55099] -> 130.216.30.180 -> 0 [+15625]
-DATE TIME [PID]:  3 [-55099] -> 130.216.30.177 -> 0 [+15876]
-DATE TIME [PID]:  3 [-55350] -> 130.216.30.174 -> 0 [+15129]
-DATE TIME [PID]:  3 [-55350] -> 130.216.30.173 -> 0 [+15129]
-DATE TIME [PID]:  3 [-36864] -> 10.19.99.252 -> 0 [+9216]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 3 [-55350] -> 130.216.30.174 -> 0 [+15129]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [15129]
-DATE TIME [PID]:  1 [116804]
-DATE TIME [PID]:  2 [128630]
-DATE TIME [PID]:  3 [73531]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [128630]
-DATE TIME [PID]:  2 [-55099] -> 130.216.30.181 -> 0 [+30754]
-DATE TIME [PID]:  2 [-55099] -> 130.216.30.179 -> 0 [+31258]
-DATE TIME [PID]:  2 [-55099] -> 130.216.30.172 -> 0 [+31005]
-DATE TIME [PID]:  2 [-55099] -> 130.216.30.170 -> 0 [+30754]
-DATE TIME [PID]:  2 [-36864] -> 10.19.99.251 -> 0 [+18432]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 2 [-55099] -> 130.216.30.181 -> 0 [+30754]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [45883]
-DATE TIME [PID]:  1 [116804]
-DATE TIME [PID]:  2 [73531]
-DATE TIME [PID]:  3 [73531]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [116804]
-DATE TIME [PID]:  1 [-48690] -> 130.216.30.176 -> 0 [+46630]
-DATE TIME [PID]:  1 [-49186] -> 130.216.30.175 -> 0 [+46387]
-DATE TIME [PID]:  1 [-49186] -> 130.216.30.171 -> 0 [+45883]
-DATE TIME [PID]:  1 [-43273] -> 10.19.99.253 -> 0 [+27648]
-DATE TIME [PID]:  1 [-43273] -> 10.19.99.250 -> 0 [+27648]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]: 1 [-43273] -> 10.19.99.253 -> 0 [+27648]
-DATE TIME [PID]: +++++++++++++++++++++++++++++++++++++++++
-DATE TIME [PID]: Selecting most imbalanced node from:
-DATE TIME [PID]:  0 [73531]
-DATE TIME [PID]:  1 [73531]
-DATE TIME [PID]:  2 [73531]
-DATE TIME [PID]:  3 [73531]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 0 [73531]
-DATE TIME [PID]:  0 [-39970] -> 130.216.30.181 -> 0 [+39970]
-DATE TIME [PID]:  0 [-39970] -> 130.216.30.178 -> 0 [+39970]
-DATE TIME [PID]:  0 [-39474] -> 130.216.30.174 -> 0 [+39474]
-DATE TIME [PID]:  0 [-27648] -> 10.19.99.253 -> 0 [+27648]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 1 [73531]
-DATE TIME [PID]:  1 [-39474] -> 130.216.30.176 -> 0 [+55846]
-DATE TIME [PID]:  1 [-39970] -> 130.216.30.175 -> 0 [+55603]
-DATE TIME [PID]:  1 [-39970] -> 130.216.30.171 -> 0 [+55099]
-DATE TIME [PID]:  1 [-27648] -> 10.19.99.250 -> 0 [+43273]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 2 [73531]
-DATE TIME [PID]:  2 [-39474] -> 130.216.30.179 -> 0 [+56099]
-DATE TIME [PID]:  2 [-39970] -> 130.216.30.172 -> 0 [+55350]
-DATE TIME [PID]:  2 [-39970] -> 130.216.30.170 -> 0 [+55099]
-DATE TIME [PID]:  2 [-27648] -> 10.19.99.251 -> 0 [+43273]
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  ----------------------------------------
-DATE TIME [PID]:  CONSIDERING MOVES FROM 3 [73531]
-DATE TIME [PID]:  3 [-39970] -> 130.216.30.180 -> 0 [+56099]
-DATE TIME [PID]:  3 [-39970] -> 130.216.30.177 -> 0 [+55846]
-DATE TIME [PID]:  3 [-39474] -> 130.216.30.173 -> 0 [+55350]
-DATE TIME [PID]:  3 [-27648] -> 10.19.99.252 -> 0 [+43777]
-DATE TIME [PID]:  ----------------------------------------
-130.216.30.181 0
-130.216.30.180 3
-130.216.30.179 2
-130.216.30.178 0
-130.216.30.177 3
-130.216.30.176 1
-130.216.30.175 1
-130.216.30.174 0
-130.216.30.173 3
-130.216.30.172 2
-130.216.30.171 1
-130.216.30.170 2
-10.19.99.253 0
-10.19.99.252 3
-10.19.99.251 2
-10.19.99.250 1
-EOF
-
-simple_test 0,0,0,0 <<EOF
-10.19.99.250 1
-10.19.99.251 2
-10.19.99.252 3
-10.19.99.253 1
-130.216.30.170 2
-130.216.30.171 1
-130.216.30.172 2
-130.216.30.173 3
-130.216.30.174 3
-130.216.30.175 1
-130.216.30.176 1
-130.216.30.177 3
-130.216.30.178 1
-130.216.30.179 2
-130.216.30.180 3
-130.216.30.181 2
-EOF
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "12+4 IPs, 4 nodes, 3 -> 4 healthy"
+
+export CTDB_TEST_LOGLEVEL=4
+
+required_result <<EOF
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES (UNASSIGNED)
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [0]
+${TEST_DATE_STAMP} 1 [181370]
+${TEST_DATE_STAMP} 2 [128630]
+${TEST_DATE_STAMP} 3 [128881]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [181370]
+${TEST_DATE_STAMP} 1 [-64566] -> 130.216.30.178 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-64566] -> 130.216.30.176 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-64315] -> 130.216.30.175 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-64315] -> 130.216.30.171 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-52489] -> 10.19.99.253 -> 0 [+0]
+${TEST_DATE_STAMP} 1 [-52489] -> 10.19.99.250 -> 0 [+0]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-64566] -> 130.216.30.178 -> 0 [+0]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [0]
+${TEST_DATE_STAMP} 1 [116804]
+${TEST_DATE_STAMP} 2 [128630]
+${TEST_DATE_STAMP} 3 [128881]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 3 [128881]
+${TEST_DATE_STAMP} 3 [-55099] -> 130.216.30.180 -> 0 [+15625]
+${TEST_DATE_STAMP} 3 [-55099] -> 130.216.30.177 -> 0 [+15876]
+${TEST_DATE_STAMP} 3 [-55350] -> 130.216.30.174 -> 0 [+15129]
+${TEST_DATE_STAMP} 3 [-55350] -> 130.216.30.173 -> 0 [+15129]
+${TEST_DATE_STAMP} 3 [-36864] -> 10.19.99.252 -> 0 [+9216]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}3 [-55350] -> 130.216.30.174 -> 0 [+15129]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [15129]
+${TEST_DATE_STAMP} 1 [116804]
+${TEST_DATE_STAMP} 2 [128630]
+${TEST_DATE_STAMP} 3 [73531]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [128630]
+${TEST_DATE_STAMP} 2 [-55099] -> 130.216.30.181 -> 0 [+30754]
+${TEST_DATE_STAMP} 2 [-55099] -> 130.216.30.179 -> 0 [+31258]
+${TEST_DATE_STAMP} 2 [-55099] -> 130.216.30.172 -> 0 [+31005]
+${TEST_DATE_STAMP} 2 [-55099] -> 130.216.30.170 -> 0 [+30754]
+${TEST_DATE_STAMP} 2 [-36864] -> 10.19.99.251 -> 0 [+18432]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}2 [-55099] -> 130.216.30.181 -> 0 [+30754]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [45883]
+${TEST_DATE_STAMP} 1 [116804]
+${TEST_DATE_STAMP} 2 [73531]
+${TEST_DATE_STAMP} 3 [73531]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [116804]
+${TEST_DATE_STAMP} 1 [-48690] -> 130.216.30.176 -> 0 [+46630]
+${TEST_DATE_STAMP} 1 [-49186] -> 130.216.30.175 -> 0 [+46387]
+${TEST_DATE_STAMP} 1 [-49186] -> 130.216.30.171 -> 0 [+45883]
+${TEST_DATE_STAMP} 1 [-43273] -> 10.19.99.253 -> 0 [+27648]
+${TEST_DATE_STAMP} 1 [-43273] -> 10.19.99.250 -> 0 [+27648]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP}1 [-43273] -> 10.19.99.253 -> 0 [+27648]
+${TEST_DATE_STAMP}+++++++++++++++++++++++++++++++++++++++++
+${TEST_DATE_STAMP}Selecting most imbalanced node from:
+${TEST_DATE_STAMP} 0 [73531]
+${TEST_DATE_STAMP} 1 [73531]
+${TEST_DATE_STAMP} 2 [73531]
+${TEST_DATE_STAMP} 3 [73531]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 0 [73531]
+${TEST_DATE_STAMP} 0 [-39970] -> 130.216.30.181 -> 0 [+39970]
+${TEST_DATE_STAMP} 0 [-39970] -> 130.216.30.178 -> 0 [+39970]
+${TEST_DATE_STAMP} 0 [-39474] -> 130.216.30.174 -> 0 [+39474]
+${TEST_DATE_STAMP} 0 [-27648] -> 10.19.99.253 -> 0 [+27648]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 1 [73531]
+${TEST_DATE_STAMP} 1 [-39474] -> 130.216.30.176 -> 0 [+55846]
+${TEST_DATE_STAMP} 1 [-39970] -> 130.216.30.175 -> 0 [+55603]
+${TEST_DATE_STAMP} 1 [-39970] -> 130.216.30.171 -> 0 [+55099]
+${TEST_DATE_STAMP} 1 [-27648] -> 10.19.99.250 -> 0 [+43273]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 2 [73531]
+${TEST_DATE_STAMP} 2 [-39474] -> 130.216.30.179 -> 0 [+56099]
+${TEST_DATE_STAMP} 2 [-39970] -> 130.216.30.172 -> 0 [+55350]
+${TEST_DATE_STAMP} 2 [-39970] -> 130.216.30.170 -> 0 [+55099]
+${TEST_DATE_STAMP} 2 [-27648] -> 10.19.99.251 -> 0 [+43273]
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} ----------------------------------------
+${TEST_DATE_STAMP} CONSIDERING MOVES FROM 3 [73531]
+${TEST_DATE_STAMP} 3 [-39970] -> 130.216.30.180 -> 0 [+56099]
+${TEST_DATE_STAMP} 3 [-39970] -> 130.216.30.177 -> 0 [+55846]
+${TEST_DATE_STAMP} 3 [-39474] -> 130.216.30.173 -> 0 [+55350]
+${TEST_DATE_STAMP} 3 [-27648] -> 10.19.99.252 -> 0 [+43777]
+${TEST_DATE_STAMP} ----------------------------------------
+130.216.30.181 0
+130.216.30.180 3
+130.216.30.179 2
+130.216.30.178 0
+130.216.30.177 3
+130.216.30.176 1
+130.216.30.175 1
+130.216.30.174 0
+130.216.30.173 3
+130.216.30.172 2
+130.216.30.171 1
+130.216.30.170 2
+10.19.99.253 0
+10.19.99.252 3
+10.19.99.251 2
+10.19.99.250 1
+EOF
+
+simple_test 0,0,0,0 <<EOF
+10.19.99.250 1
+10.19.99.251 2
+10.19.99.252 3
+10.19.99.253 1
+130.216.30.170 2
+130.216.30.171 1
+130.216.30.172 2
+130.216.30.173 3
+130.216.30.174 3
+130.216.30.175 1
+130.216.30.176 1
+130.216.30.177 3
+130.216.30.178 1
+130.216.30.179 2
+130.216.30.180 3
+130.216.30.181 2
+EOF
diff --git a/ctdb/tests/takeover/nondet.001.sh b/ctdb/tests/takeover/nondet.001.sh
index 6f79c3460d2..5f838eec5d5 100755
--- a/ctdb/tests/takeover/nondet.001.sh
+++ b/ctdb/tests/takeover/nondet.001.sh
@@ -5,12 +5,12 @@
 define_test "3 nodes, 1 healthy"
 
 required_result <<EOF
-DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.21.252 from 0
-DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.252 from 0
-DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.249 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.252 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.252 from 0
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.250 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.249 from 0
 192.168.21.254 2
 192.168.21.253 2
 192.168.21.252 2
diff --git a/ctdb/tests/takeover/nondet.002.sh b/ctdb/tests/takeover/nondet.002.sh
index c46f6a237cd..bc80f5c5c10 100755
--- a/ctdb/tests/takeover/nondet.002.sh
+++ b/ctdb/tests/takeover/nondet.002.sh
@@ -5,9 +5,9 @@
 define_test "3 nodes, 2 healthy"
 
 required_result <<EOF
-DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
-DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.21.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.253 from 1
+${TEST_DATE_STAMP}Unassign IP: 192.168.20.250 from 1
 192.168.21.254 2
 192.168.21.253 0
 192.168.21.252 0
diff --git a/ctdb/tests/tool/func.parse_nodestring.003.sh b/ctdb/tests/tool/func.parse_nodestring.003.sh
index 3e03ac40419..1538e2670e2 100755
--- a/ctdb/tests/tool/func.parse_nodestring.003.sh
+++ b/ctdb/tests/tool/func.parse_nodestring.003.sh
@@ -5,7 +5,7 @@
 define_test "all, current disconnected"
 
 required_result 10 <<EOF
-DATE TIME [PID]: Unable to get nodemap from local node
+${TEST_DATE_STAMP}Unable to get nodemap from local node
 EOF
 
 simple_test all true <<EOF
diff --git a/ctdb/tests/tool/stubby.getcapabilities.003.sh b/ctdb/tests/tool/stubby.getcapabilities.003.sh
index 33b1b74a203..d55bd4b39fa 100755
--- a/ctdb/tests/tool/stubby.getcapabilities.003.sh
+++ b/ctdb/tests/tool/stubby.getcapabilities.003.sh
@@ -5,7 +5,7 @@
 define_test "3 nodes, current disconnected"
 
 required_result 10 <<EOF
-DATE TIME [PID]: Unable to get nodemap from local node
+${TEST_DATE_STAMP}Unable to get nodemap from local node
 EOF
 
 simple_test <<EOF
diff --git a/ctdb/tests/tool/stubby.listnodes.001.sh b/ctdb/tests/tool/stubby.listnodes.001.sh
index 35a0c14b8eb..f2eac02643c 100755
--- a/ctdb/tests/tool/stubby.listnodes.001.sh
+++ b/ctdb/tests/tool/stubby.listnodes.001.sh
@@ -13,7 +13,7 @@ EOF
 rm -f "$CTDB_NODES"
 
 required_result 255 <<EOF
-DATE TIME [PID]: Failed to read nodes file
+${TEST_DATE_STAMP}Failed to read nodes file
 EOF
 
 simple_test <<EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.002.sh b/ctdb/tests/tool/stubby.lvsmaster.002.sh
index 68b68192d5e..10def3a62e7 100755
--- a/ctdb/tests/tool/stubby.lvsmaster.002.sh
+++ b/ctdb/tests/tool/stubby.lvsmaster.002.sh
@@ -5,7 +5,7 @@
 define_test "3 nodes, current disconnected"
 
 required_result 10 <<EOF
-DATE TIME [PID]: Unable to get nodemap from local node
+${TEST_DATE_STAMP}Unable to get nodemap from local node
 EOF
 
 simple_test -Y <<EOF
diff --git a/ctdb/tests/tool/stubby.natgwlist.009.sh b/ctdb/tests/tool/stubby.natgwlist.009.sh
index 7534fd220ac..d8029714565 100755
--- a/ctdb/tests/tool/stubby.natgwlist.009.sh
+++ b/ctdb/tests/tool/stubby.natgwlist.009.sh
@@ -11,10 +11,10 @@ setup_natgw <<EOF
 EOF
 
 required_result 255 <<EOF
-DATE TIME [PID]: __LOCATION__ control timed out. reqid:1234567890 opcode:80 dstnode:0
-DATE TIME [PID]: __LOCATION__ ctdb_control_recv failed
-DATE TIME [PID]: __LOCATION__ ctdb_ctrl_getcapabilities_recv failed
-DATE TIME [PID]: Unable to get capabilities from node 0
+${TEST_DATE_STAMP}__LOCATION__ control timed out. reqid:1234567890 opcode:80 dstnode:0
+${TEST_DATE_STAMP}__LOCATION__ ctdb_control_recv failed
+${TEST_DATE_STAMP}__LOCATION__ ctdb_ctrl_getcapabilities_recv failed
+${TEST_DATE_STAMP}Unable to get capabilities from node 0
 EOF
 
 simple_test <<EOF
diff --git a/ctdb/tests/tool/stubby.xpnn.003.sh b/ctdb/tests/tool/stubby.xpnn.003.sh
index 152d2300233..b235f1187c2 100755
--- a/ctdb/tests/tool/stubby.xpnn.003.sh
+++ b/ctdb/tests/tool/stubby.xpnn.003.sh
@@ -13,7 +13,7 @@ EOF
 rm -f "$CTDB_NODES"
 
 required_result 255 <<EOF
-DATE TIME [PID]: Failed to read nodes file
+${TEST_DATE_STAMP}Failed to read nodes file
 EOF
 
 simple_test <<EOF
-- 
2.11.4.GIT