diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-08-23 13:52:42 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-30 16:51:55 +1000 |
| commit | 857e144a97e7a86cedaee3fcb5f519b802f9cf16 (patch) | |
| tree | aba7dc588f4f1e02f9329e2165f768c858bbef14 | |
| parent | 5de459f94e2f4420ec60f16f669ff8443bb2c24f (diff) | |
| download | samba-857e144a97e7a86cedaee3fcb5f519b802f9cf16.tar.gz samba-857e144a97e7a86cedaee3fcb5f519b802f9cf16.tar.xz samba-857e144a97e7a86cedaee3fcb5f519b802f9cf16.zip | |
Tests - eventscripts - Samba TCP port checking fixes
Expect "ctdb checktcpport" to exit with 1 if not implemented.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 20885d592040eb3945524c558b593a1d50a57b43)
| -rwxr-xr-x | ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh index b913741325..4bc854b623 100755 --- a/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh +++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh @@ -17,7 +17,7 @@ tcp_port_down 139 required_result 1 <<EOF DEBUG: ctdb_check_ports - checker ctdb not implemented DEBUG: output from checker was: -DEBUG: ctdb checktcpport 445 (exited with 0) with output: +DEBUG: ctdb checktcpport 445 (exited with 1) with output: $ctdb_not_implemented ERROR: samba tcp port 139 is not responding DEBUG: nmap -n -oG - -PS 127.0.0.1 -p 445,139 shows this output: diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh b/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh index ca30d16fba..80264cc24e 100755 --- a/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh +++ b/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh @@ -18,7 +18,7 @@ tcp_port_down 139 required_result 1 <<EOF DEBUG: ctdb_check_ports - checker ctdb not implemented DEBUG: output from checker was: -DEBUG: ctdb checktcpport 445 (exited with 0) with output: +DEBUG: ctdb checktcpport 445 (exited with 1) with output: $ctdb_not_implemented DEBUG: ctdb_check_ports - checker nmap not implemented DEBUG: output from checker was: |