diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-09-24 17:07:12 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-10-06 12:34:32 +0200 |
| commit | 1c8c0be6f97f74169c0b46be4df2245aa631186a (patch) | |
| tree | ae23326470902b37c3403f58226f49e9642984e4 /ctdb/tests/tool | |
| parent | b544073653a5b54ba8ec2621c7314136656cfaeb (diff) | |
| download | samba-1c8c0be6f97f74169c0b46be4df2245aa631186a.tar.gz samba-1c8c0be6f97f74169c0b46be4df2245aa631186a.tar.xz samba-1c8c0be6f97f74169c0b46be4df2245aa631186a.zip | |
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>
Diffstat (limited to 'ctdb/tests/tool')
| -rwxr-xr-x | ctdb/tests/tool/func.parse_nodestring.003.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/tool/stubby.getcapabilities.003.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/tool/stubby.listnodes.001.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/tool/stubby.lvsmaster.002.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/tool/stubby.natgwlist.009.sh | 8 | ||||
| -rwxr-xr-x | ctdb/tests/tool/stubby.xpnn.003.sh | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ctdb/tests/tool/func.parse_nodestring.003.sh b/ctdb/tests/tool/func.parse_nodestring.003.sh index 3e03ac4041..1538e2670e 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 33b1b74a20..d55bd4b39f 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 35a0c14b8e..f2eac02643 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 68b68192d5..10def3a62e 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 7534fd220a..d802971456 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 152d230023..b235f1187c 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 |