summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2011-07-05 12:54:51 +1000
committerMartin Schwenke <martin@meltin.net>2011-08-08 13:38:07 +1000
commit604eb67102b061b84f99d4a1ac6290288fd5ca73 (patch)
tree90c135fdc74c3b11dad0039c2784a8792f43e470
parent2396846ca1fa745d4e34b0d531d0c04982318dea (diff)
downloadsamba-604eb67102b061b84f99d4a1ac6290288fd5ca73.tar.gz
samba-604eb67102b061b84f99d4a1ac6290288fd5ca73.tar.xz
samba-604eb67102b061b84f99d4a1ac6290288fd5ca73.zip
Tests: tweak some samba tests to cope with debug from ctdb_check_tcp_ports().
This is a bit too static. However, it can fixed up later if it is a hassle. Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 557ac30e60516742da10b83bfbbbb41430c977a2)
-rwxr-xr-xctdb/tests/eventscripts/simple/50.samba.monitor.103.sh8
-rwxr-xr-xctdb/tests/eventscripts/simple/50.samba.monitor.104.sh8
2 files changed, 14 insertions, 2 deletions
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
index 8854780cad..924d953ff4 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
@@ -7,6 +7,12 @@ define_test "port 445 down"
setup_samba
tcp_port_down 445
-required_result 1 "ERROR: samba tcp port 445 is not responding"
+required_result 1 <<EOF
+ERROR: samba tcp port 445 is not responding
+netstat -l -t -n shows this output:
+Active Internet connections (servers only)
+Proto Recv-Q Send-Q Local Address Foreign Address State
+tcp 0 0 0.0.0.0:139 0.0.0.0:* LISTEN
+EOF
simple_test
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
index a29e7838b3..c05b8d45f6 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
+++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
@@ -7,6 +7,12 @@ define_test "port 139 down"
setup_samba
tcp_port_down 139
-required_result 1 "ERROR: samba tcp port 139 is not responding"
+required_result 1 <<EOF
+ERROR: samba tcp port 139 is not responding
+netstat -l -t -n shows this output:
+Active Internet connections (servers only)
+Proto Recv-Q Send-Q Local Address Foreign Address State
+tcp 0 0 0.0.0.0:445 0.0.0.0:* LISTEN
+EOF
simple_test