Revert "Tests: tweak some samba tests to cope with debug from ctdb_check_tcp_ports()."

This reverts commit 557ac30e60516742da10b83bfbbbb41430c977a2.

diff --git a/tests/eventscripts/simple/50.samba.monitor.103.sh b/tests/eventscripts/simple/50.samba.monitor.103.sh
index 924d953ff4e27a8f031f056cac29902519f01f3b..8854780cadebf015a1846bcf438f1eed89b4917d 100644 (file)
--- a/tests/eventscripts/simple/50.samba.monitor.103.sh
+++ b/tests/eventscripts/simple/50.samba.monitor.103.sh
@@ -7,12 +7,6 @@ define_test "port 445 down"
 setup_samba
 tcp_port_down 445
 
-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
+required_result 1 "ERROR: samba tcp port 445 is not responding"
 
 simple_test

diff --git a/tests/eventscripts/simple/50.samba.monitor.104.sh b/tests/eventscripts/simple/50.samba.monitor.104.sh
index c05b8d45f6e853d163373e2680bc14c50d2f85a1..a29e7838b3a60e145a727b4352e6830eb1bf882e 100644 (file)
--- a/tests/eventscripts/simple/50.samba.monitor.104.sh
+++ b/tests/eventscripts/simple/50.samba.monitor.104.sh
@@ -7,12 +7,6 @@ define_test "port 139 down"
 setup_samba
 tcp_port_down 139
 
-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
+required_result 1 "ERROR: samba tcp port 139 is not responding"
 
 simple_test