sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

ctdb-tests: Drop residual CTDB_MANAGED_<service> variables

Browse Source 
These no longer do anything.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke
2018-07-07 20:16:42 +10:00
committed by Amitay Isaacs
parent e081cafc9c
commit 451c6b668f
17 changed files with 1 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/tests/eventscripts/31.clamd.monitor.002.sh
View File

@ -7,7 +7,6 @@ define_test "Managed, clamd not listening"
setup setup
setup_script_options <<EOF setup_script_options <<EOF
CTDB_MANAGES_CLAMD=yes
CTDB_CLAMD_SOCKET="/var/run/clamd.sock" CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
EOF EOF

1
ctdb/tests/eventscripts/31.clamd.monitor.003.sh
View File

@ -7,7 +7,6 @@ define_test "Managed, clamd listening"
setup setup
setup_script_options <<EOF setup_script_options <<EOF
CTDB_MANAGES_CLAMD=yes
CTDB_CLAMD_SOCKET="/var/run/clamd.sock" CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
EOF EOF

4
ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed, down - once, twice"
setup "down" setup "down"
setup_script_options <<EOF
CTDB_MANAGES_VSFTPD="yes"
EOF
ok <<EOF ok <<EOF
vsftpd not listening on TCP port 21 vsftpd not listening on TCP port 21
WARNING: vsftpd not listening but less than 2 consecutive failures, not unhealthy yet WARNING: vsftpd not listening but less than 2 consecutive failures, not unhealthy yet

4
ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "up" setup "up"
setup_script_options <<EOF
CTDB_MANAGES_VSFTPD="yes"
EOF
ok <<EOF ok <<EOF
Stopping vsftpd: OK Stopping vsftpd: OK
EOF EOF

4
ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "down" setup "down"
setup_script_options <<EOF
CTDB_MANAGES_VSFTPD="yes"
EOF
ok <<EOF ok <<EOF
Starting vsftpd: OK Starting vsftpd: OK
EOF EOF

4
ctdb/tests/eventscripts/41.httpd.monitor.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed, down - 5 times"
setup "down" setup "down"
setup_script_options <<EOF
CTDB_MANAGES_HTTPD="yes"
EOF
ok_null ok_null
simple_test simple_test

4
ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "up" setup "up"
setup_script_options <<EOF
CTDB_MANAGES_HTTPD="yes"
EOF
ok <<EOF ok <<EOF
Stopping httpd: OK Stopping httpd: OK
EOF EOF

4
ctdb/tests/eventscripts/41.httpd.startup.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "down" setup "down"
setup_script_options <<EOF
CTDB_MANAGES_HTTPD="yes"
EOF
ok <<EOF ok <<EOF
Starting httpd: OK Starting httpd: OK
EOF EOF

4
ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "up" setup "up"
setup_script_options <<EOF
CTDB_MANAGES_WINBIND="yes"
EOF
ok <<EOF ok <<EOF
Stopping winbind: OK Stopping winbind: OK
EOF EOF

4
ctdb/tests/eventscripts/49.winbind.startup.002.sh
View File

@ -6,10 +6,6 @@ define_test "managed"
setup "down" setup "down"
setup_script_options <<EOF
CTDB_MANAGES_WINBIND="yes"
EOF
ok <<EOF ok <<EOF
Starting winbind: OK Starting winbind: OK
EOF EOF

4
ctdb/tests/eventscripts/scripts/06.nfs.sh
View File

@ -1,6 +1,4 @@
setup () setup ()
{ {
setup_script_options "service" "60.nfs" <<EOF :
CTDB_MANAGES_NFS="yes"
EOF
} }

2
ctdb/tests/eventscripts/scripts/31.clamd.sh
View File

@ -1,9 +1,7 @@
setup () setup ()
{ {
setup_script_options <<EOF setup_script_options <<EOF
CTDB_MANAGES_CLAMD="yes"
CTDB_CLAMD_SOCKET="/var/run/clamd.sock" CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
EOF EOF
setup_unix_listen setup_unix_listen

4
ctdb/tests/eventscripts/scripts/40.vsftpd.sh
View File

@ -9,8 +9,4 @@ setup ()
else else
service "$_service_name" force-stopped service "$_service_name" force-stopped
fi fi
setup_script_options <<EOF
CTDB_MANAGES_VSFTPD=""
EOF
} }

4
ctdb/tests/eventscripts/scripts/41.httpd.sh
View File

@ -11,8 +11,4 @@ setup ()
service "$_service_name" force-stopped service "$_service_name" force-stopped
done done
fi fi
setup_script_options <<EOF
CTDB_MANAGES_HTTPD=""
EOF
} }

8
ctdb/tests/eventscripts/scripts/49.winbind.sh
View File

@ -8,10 +8,6 @@ setup ()
service "winbind" force-started service "winbind" force-started
setup_script_options <<EOF
CTDB_MANAGES_WINBIND="yes"
EOF
export FAKE_WBINFO_FAIL="no" export FAKE_WBINFO_FAIL="no"
else else
@ -19,10 +15,6 @@ EOF
service "winbind" force-stopped service "winbind" force-stopped
setup_script_options <<EOF
CTDB_MANAGES_WINBIND=""
EOF
export FAKE_WBINFO_FAIL="yes" export FAKE_WBINFO_FAIL="yes"
fi fi
} }

8
ctdb/tests/eventscripts/scripts/50.samba.sh
View File

@ -11,10 +11,6 @@ setup ()
service "$i" force-started service "$i" force-started
done done
setup_script_options <<EOF
CTDB_MANAGES_SAMBA="yes"
EOF
setup_tcp_listen 445 139 setup_tcp_listen 445 139
# Some things in 50.samba are backgrounded and waited # Some things in 50.samba are backgrounded and waited
@ -29,10 +25,6 @@ EOF
service "$i" force-stopped service "$i" force-stopped
done done
setup_script_options <<EOF
CTDB_MANAGES_SAMBA=""
EOF
setup_tcp_listen setup_tcp_listen
fi fi

8
ctdb/tests/eventscripts/scripts/60.nfs.sh
View File

@ -23,10 +23,6 @@ EOF
service "nfs" force-started service "nfs" force-started
service "nfslock" force-started service "nfslock" force-started
setup_script_options <<EOF
CTDB_MANAGES_NFS="yes"
EOF
rpc_services_up \ rpc_services_up \
"portmapper" "nfs" "mountd" "rquotad" \ "portmapper" "nfs" "mountd" "rquotad" \
"nlockmgr" "status" "nlockmgr" "status"
@ -40,10 +36,6 @@ EOF
service "nfs" force-stopped service "nfs" force-stopped
service "nfslock" force-stopped service "nfslock" force-stopped
setup_script_options <<EOF
CTDB_MANAGES_NFS=""
EOF
fi fi
# This is really nasty. However, when we test NFS we don't # This is really nasty. However, when we test NFS we don't