diff options
| author | Gerald Carter <jerry@samba.org> | 2005-08-25 13:53:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:22 -0500 |
| commit | dffa98b761a0dc663be9b1d64b3fe1fc180440fb (patch) | |
| tree | ba62d293ae5637021d1e91cd595aadbc1cf1f7fc | |
| parent | 78f6ccebc584446823bdf3ae8435827328a74448 (diff) | |
| download | samba-dffa98b761a0dc663be9b1d64b3fe1fc180440fb.tar.gz samba-dffa98b761a0dc663be9b1d64b3fe1fc180440fb.tar.bz2 samba-dffa98b761a0dc663be9b1d64b3fe1fc180440fb.zip | |
r9615: trying a 3 second timeout on smbcontrol
(This used to be commit 4e62a51bf68e8ef19beed63a7520e0db20321b11)
| -rw-r--r-- | source3/script/tests/functions | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/script/tests/functions b/source3/script/tests/functions index 40e185e153..13139f6d8f 100644 --- a/source3/script/tests/functions +++ b/source3/script/tests/functions @@ -2,13 +2,16 @@ ## library file for test functions ## + +SMBCONTROL="smbcontrol -t 3" + ## ## start/stop smbd daemon ## check_smbd_running() { ## the smbcontrol ping will return a 0 on success - smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null + $SMBCONTROL $CONFIGURATION smbd ping 2>&1 > /dev/null } start_smbd() @@ -19,7 +22,7 @@ start_smbd() sleep 1 - smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $? + $SMBCONTROL $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $? } stop_smbd() @@ -30,7 +33,7 @@ stop_smbd() ## belt and braces; first kill and then send a shutdown message kill -TERM $smbd_pid - smbcontrol $CONFIGURATION smbd shutdown + $SMBCONTROL $CONFIGURATION smbd shutdown ## check to see if smbd is already running check_smbd_running @@ -47,7 +50,7 @@ stop_smbd() check_nmbd_running() { ## the smbcontrol ping will return a 0 on success - smbcontrol $CONFIGURATION nmbd ping 2>&1 > /dev/null + $SMBCONTROL $CONFIGURATION nmbd ping 2>&1 > /dev/null } start_nmbd() |