[Cvs-cvs] ccvs/src ChangeLog sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/07 14:25:11

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        [patch #4992]
        * sanity.sh (server): Handle tests launched with stdin closed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3365&tr2=1.3366&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1124&tr2=1.1125&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3365 ccvs/src/ChangeLog:1.3366
--- ccvs/src/ChangeLog:1.3365   Wed Apr  5 14:45:28 2006
+++ ccvs/src/ChangeLog  Fri Apr  7 14:25:10 2006
@@ -1,3 +1,8 @@
+2006-04-07  Derek Price  <address@hidden>
+
+       [patch #4992]
+       * sanity.sh (server): Handle tests launched with stdin closed.
+
 2006-04-05  Derek Price  <address@hidden>
 
        [patch #4992]
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1124 ccvs/src/sanity.sh:1.1125
--- ccvs/src/sanity.sh:1.1124   Wed Apr  5 14:19:05 2006
+++ ccvs/src/sanity.sh  Fri Apr  7 14:25:10 2006
@@ -31445,12 +31445,16 @@
 noop
 EOF
 
-           # Test the server timeout feature.  If this fails, this test may
-           # block indefinitely.
-           dotest server-23 "$testcvs --timeout 5s server" \
+           # Test the server timeout feature.  The sleep below serves two
+           # purposes.  First, if the timeout is broken, this test won't pause
+           # indefinitely.  Second, when this test suite is run with stdin
+           # closed, the CVS server won't exit immediately.
+           dotest server-23 \
+"sleep 4 </dev/null |$testcvs --timeout 2s server" \
 "E Fatal server error, aborting\.
 error ETIMEOUT Connection timed out\."
-           dotest_fail server-24 "$testcvs --timeout 5X server" \
+           dotest server-24 "sleep 2 </dev/null |$testcvs --timeout 4s server"
+           dotest_fail server-25 "$testcvs --timeout 5X server" \
 "$CPROG server: unknown units (\`X') in argument to --timeout
 $CPROG \[server aborted\]: (valid units are: none, \`d', \`h', \`m', & \`s')"