You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/11/03 13:53:57 UTC
svn commit: r330539 - in /tcl/websh/trunk/src/tests: cfg.test encrypt.test
filecontext.test filecounter.test filelock.test log.test logtosyslog.test
messages.test
Author: ronnie
Date: Thu Nov 3 04:53:42 2005
New Revision: 330539
URL: http://svn.apache.org/viewcvs?rev=330539&view=rev
Log:
- tests activated and fixed for Windows
- activated some previsously unused tests
- deactivated file permission tests for Windows (n/a)
Modified:
tcl/websh/trunk/src/tests/cfg.test
tcl/websh/trunk/src/tests/encrypt.test
tcl/websh/trunk/src/tests/filecontext.test
tcl/websh/trunk/src/tests/filecounter.test
tcl/websh/trunk/src/tests/filelock.test
tcl/websh/trunk/src/tests/log.test
tcl/websh/trunk/src/tests/logtosyslog.test
tcl/websh/trunk/src/tests/messages.test
Modified: tcl/websh/trunk/src/tests/cfg.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/cfg.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/cfg.test (original)
+++ tcl/websh/trunk/src/tests/cfg.test Thu Nov 3 04:53:42 2005
@@ -90,7 +90,7 @@
lappend res [web::config filepermissions]
} {0644 0600 0604 0604 0644 0600 0644}
-test cfg-4.3 {filecounter file permissions} {
+test cfg-4.3 {filecounter file permissions} {unixOnly} {
catch {
set umask [exec umask]
if {$umask != 0} {
@@ -126,7 +126,7 @@
set res
} {00644 00600 00666 00604 00666}
-test cfg-4.4 {formdata file upload file permissions} {
+test cfg-4.4 {formdata file upload file permissions} {unixOnly} {
web::config uploadfilesize 500
global data
@@ -152,7 +152,7 @@
set res
} {00600 17 00602 17 00660 17 00640 17 00666 17 00400 17}
-test cfg-4.5 {session context file permissions} {
+test cfg-4.5 {session context file permissions} {unixOnly} {
set res {}
foreach {ctx perm} {a 0644 b 0600 c 0640 d 0602 e 0666} {
@@ -170,7 +170,7 @@
} {00644 00600 00640 00602 00666}
-test cfg-4.6 {log file permissions} {
+test cfg-4.6 {log file permissions} {unixOnly} {
set res {}
foreach perm {0644 0600 0602 0660 0640 0666 0400} {
web::config filepermissions $perm
Modified: tcl/websh/trunk/src/tests/encrypt.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/encrypt.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/encrypt.test (original)
+++ tcl/websh/trunk/src/tests/encrypt.test Thu Nov 3 04:53:42 2005
@@ -93,15 +93,13 @@
} {1}
-test decrypt-1.6 {string with spaces} {emptyTest } {
-
- ## fixme: think about this one
+test decrypt-1.6 {string with spaces} {
web::config decryptchain web::decryptd
- set res [catch {web::decrypt [web::uridecode "a+b"]} msg]
+ set res [catch {set str [web::decrypt [web::uridecode "a+b"]]} msg]
web::config decryptchain web::decryptd
- set res
-} {0}
+ lappend res $str
+} {0 {a b}}
# -----------------------------------------------------------------------------
# error signaling
Modified: tcl/websh/trunk/src/tests/filecontext.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/filecontext.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/filecontext.test (original)
+++ tcl/websh/trunk/src/tests/filecontext.test Thu Nov 3 04:53:42 2005
@@ -116,6 +116,8 @@
set filename [web::tempfile]
set fh [open $filename {CREAT WRONLY}]
+ fconfigure $fh -translation binary
+
web::lockfile $fh
puts $fh "longmessage and more"
web::unlockfile $fh
@@ -123,21 +125,26 @@
## without truncation
set fh [open $filename {CREAT WRONLY}]
+ fconfigure $fh -translation binary
+
web::lockfile $fh
puts $fh "shortmsg"
web::unlockfile $fh
close $fh
# test read
set fh [open $filename r]
+ fconfigure $fh -translation binary
set res [read $fh]
close $fh
append res " - "
## with truncation
set fh [open $filename {CREAT WRONLY}]
+ fconfigure $fh -translation binary
web::lockfile $fh
flush $fh
set fh2 [open $filename {CREAT WRONLY TRUNC}]
+ fconfigure $fh -translation binary
close $fh2
seek $fh 0 start
@@ -147,6 +154,7 @@
# test read
set fh [open $filename r]
+ fconfigure $fh -translation binary
append res [read $fh]
close $fh
Modified: tcl/websh/trunk/src/tests/filecounter.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/filecounter.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/filecounter.test (original)
+++ tcl/websh/trunk/src/tests/filecounter.test Thu Nov 3 04:53:42 2005
@@ -89,7 +89,7 @@
test filecounter-2.8 {get config of previous filecounter} {
set res [handle3 config]
- string compare $res "file $filename handle handle3 seed 2 min 2 max 3 incr 1 perms 0644 wrap true curr 2"
+ string compare $res "file [list $filename] handle handle3 seed 2 min 2 max 3 incr 1 perms 0644 wrap true curr 2"
} {0}
test filecounter-2.9 {use invalid param/switch} {
Modified: tcl/websh/trunk/src/tests/filelock.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/filelock.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/filelock.test (original)
+++ tcl/websh/trunk/src/tests/filelock.test Thu Nov 3 04:53:42 2005
@@ -26,14 +26,14 @@
test truncatefile-1.1 {create file, truncate it, and test size} {
set fh [open [set fn [web::tempfile]] w]
- puts $fh [string repeat "a" 10000]
+ puts -nonewline $fh [string repeat "a" 10000]
flush $fh
set res [file size $fn]
web::truncatefile $fh
close $fh
lappend res [file size $fn]
-} {10001 0}
+} {10000 0}
test truncatefile-1.2 {wrong args} {
Modified: tcl/websh/trunk/src/tests/log.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/log.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/log.test (original)
+++ tcl/websh/trunk/src/tests/log.test Thu Nov 3 04:53:42 2005
@@ -246,13 +246,14 @@
set res [string compare $tmp "$curTim AABBCCDD"]
} {0}
-test log-2.6 {websh3_weblog: test delete from logdest} {emptyTest} {
+test log-2.6 {websh3_weblog: test delete from logdest} {
web::logdest delete
+ set fh [open test.dat w]
web::logdest add test0.alert file "test.dat"
web::logdest add test1.error command dummy
- web::logdest add test2.warning syslog 10
+ web::logdest add test2.warning channel $fh
set id [web::logdest add test3.info command dummy]
web::logdest add test4.debug command dummy
@@ -260,13 +261,15 @@
web::logdest delete $id
## and see what we have
- set res [web::logdest names]
+ set res [web::logdest levels]
+ close $fh
+ web::logdest delete
file delete test.dat
set res
-} {logdest0 test0.alert-alert file
-logdest1 test1.error-error command
-logdest2 test2.warning-warning syslog
-logdest4 test4.debug-debug command}
+} {logdest0 test0.alert-alert
+logdest1 test1.error-error
+logdest2 test2.warning-warning
+logdest4 test4.debug-debug}
test log-2.7 {websh3_weblog: try to delete non-existing logdest} {
Modified: tcl/websh/trunk/src/tests/logtosyslog.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtosyslog.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtosyslog.test (original)
+++ tcl/websh/trunk/src/tests/logtosyslog.test Thu Nov 3 04:53:42 2005
@@ -27,23 +27,16 @@
# -----------------------------------------------------------------------------
proc scanFileForPattern {fileName pattern} {
- set res "Failed"
if {[file exists $fileName]} {
if {[catch {
- set fileId [open $fileName "r"]
- while {[eof $fileId] == 0} {
- gets $fileId tLine
- if {[string match $pattern $tLine] == 1} {
- set res "Ok"
- break
- }
- }
- close $fileId
+ exec grep $pattern $fileName
} msg]} {
- return "$res: $msg"
+ return 0
+ } else {
+ return 1
}
}
- return $res
+ return 0
}
# -----------------------------------------------------------------------------
@@ -55,37 +48,28 @@
set res [web::logdest add info2.-debug syslog 0]
} {logdest0}
-test logToSyslog-1.2 {websh3_toSyslog: test log} {unixOnly, emptyTest} {
+test logToSyslog-1.2 {websh3_toSyslog: test log} {unixOnly} {
set res "Failed"
+
set curTim [clock seconds]
web::logdest delete
web::loglevel delete
+ set format "Websh T E S T toSyslog \[$curTim\]\n"
web::loglevel add info.-debug
- web::logdest add \
- -format "T E S T toSyslog -- %x %X \[$curTim\] \$f-\$l-\$m\n" \
- info.-debug \
- syslog 10
+ web::logdest add -format $format info.-debug syslog 10
web::log info.info {toSyslog}
- # and see if you find it in the file
- #fixme: generic filename please!
-
- set pat1 "[file dirname [web::tempfile]]/messages"
-
set srclst [list /var/adm/messages /var/log/messages /var/log/syslog]
+ ## give syslog a little time to feed the message to the file
+ after 1000
+
foreach tmp $srclst {
- set res "Failed"
- set res [scanFileForPattern $tmp "T E S T toSyslog*$curTim*"]
- if {[string equal $res "Failed"]} {
- ## give syslog a little time to feed the message to the file
- after 1000
- set res [scanFileForPattern $pat1 "T E S T toSyslog*$curTim*"]
- }
- if {[string equal $res "Ok"]} {
+ if {[scanFileForPattern $tmp $format]} {
+ set res "Ok"
break
}
}
Modified: tcl/websh/trunk/src/tests/messages.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/messages.test?rev=330539&r1=330538&r2=330539&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/messages.test (original)
+++ tcl/websh/trunk/src/tests/messages.test Thu Nov 3 04:53:42 2005
@@ -24,37 +24,37 @@
# -----------------------------------------------------------------------------
# errors
# -----------------------------------------------------------------------------
-test messages-1.1 {web::send wrong number of arguments} {unixOnly} {
+test messages-1.1 {web::send wrong number of arguments} {
catch {web::send} msg
set msg
} {wrong # args: should be "web::send channel cmdnr string ??#?flags?"}
-test messages-1.2 {web::send wrong number of arguments} {unixOnly} {
+test messages-1.2 {web::send wrong number of arguments} {
catch {web::send 1 2 3 4 5} msg
set msg
} {wrong # args: should be "web::send channel cmdnr string ??#?flags?"}
-test messages-1.3 {web::recv wrong number of arguments} {unixOnly} {
+test messages-1.3 {web::recv wrong number of arguments} {
catch {web::recv} msg
set msg
} {wrong # args: should be "web::recv channel cmdvarname resvarname flagsvarname"}
-test messages-1.4 {web::recv wrong number of arguments} {unixOnly} {
+test messages-1.4 {web::recv wrong number of arguments} {
catch {web::recv 1 2 3 4 5} msg
set msg
} {wrong # args: should be "web::recv channel cmdvarname resvarname flagsvarname"}
-test messages-1.5 {web::msgflag wrong number of arguments} {unixOnly} {
+test messages-1.5 {web::msgflag wrong number of arguments} {
catch {web::msgflag 1 2 3 4 5} msg
set msg
} {wrong # args: should be "web::msgflag ?flags? ?testflags?"}
-test messages-1.6 {web::msgflag set unknown flag} {unixOnly} {
+test messages-1.6 {web::msgflag set unknown flag} {
catch {set flag [web::msgflag gugus]} msg
set msg
} {unknown flag "gugus"}
-test messages-1.7 {web::msgflag test for unknown flag} {unixOnly} {
+test messages-1.7 {web::msgflag test for unknown flag} {
set flag [web::msgflag multiple]
catch {set res [web::msgflag $flag gugus]} msg
set msg
@@ -63,75 +63,76 @@
# -----------------------------------------------------------------------------
# normal operation
# -----------------------------------------------------------------------------
-test messages-2.1 {web::send and recieve} {unixOnly} {
+test messages-2.1 {web::send and receive} {
set curTim [clock clicks]
set fileName [web::tempfile]
set fileId [open $fileName "w"]
- set cmd 10011
- set flags 131072
+ set icmd 10011
+ set iflag 131072
set text "T E S T $curTim"
- web::send $fileId $cmd $text \#$flags
+ web::send $fileId $icmd $text \#$iflag
close $fileId
set fileId [open $fileName "r"]
- web::recv $fileId cmd res flag
+ web::recv $fileId ocmd res oflag
- set expected "$cmd-$text-$flags"
- set res "$cmd-$res-$flag"
+ set in "$icmd-$text-$iflag"
+ set out "$ocmd-$res-$oflag"
- set res [string compare $expected $res]
+ set res [string compare $in $out]
} {0}
-test messages-2.1b {web::send and recieve} {unixOnly} {
+# problems with large messages on WIndows (don't know why)
+test messages-2.1b {web::send and receive large} {unixOnly} {
set fileName [web::tempfile]
set fileId [open $fileName "w"]
- set cmd 10011
- set flags 131072
+ set icmd 10011
+ set iflag 131072
set text [string repeat "Test" 100000]
- web::send $fileId $cmd $text \#$flags
+ web::send $fileId $icmd $text \#$iflag
close $fileId
set fileId [open $fileName "r"]
- web::recv $fileId cmd res flag
+ web::recv $fileId ocmd res oflag
close $fileId
- set expected "$cmd-$text-$flags"
- set res "$cmd-$res-$flag"
+ set in "$icmd-$text-$iflag"
+ set out "$ocmd-$res-$oflag"
- set res [string compare $expected $res]
+ set res [string compare $in $out]
} {0}
-test messages-2.1c {web::send and recieve unicode} {} {
+test messages-2.1c {web::send and receive unicode} {
set fileName [web::tempfile]
set fileId [open $fileName "w"]
- set cmd 10011
- set flags 131072
+ set icmd 10011
+ set iflag 131072
set text "abc\u00c2defä1ö2ü3"
- web::send $fileId $cmd $text \#$flags
+ web::send $fileId $icmd $text \#$iflag
close $fileId
set fileId [open $fileName "r"]
- set expected "$cmd-$text-$flags"
+ set in "$icmd-$text-$iflag"
- web::recv $fileId cmd res flag
+ web::recv $fileId ocmd res oflag
- set res "$cmd-$res-$flag"
+ set out "$ocmd-$res-$oflag"
- set res [string compare $expected $res]
+ set res [string compare $in $out]
} {0}
-test messages-2.2 {web::msgflag no arg} {unixOnly} {
+test messages-2.2 {web::msgflag no arg} {
set res [web::msgflag]
} {multiple}
-test messages-2.3 {web::msgflag set and test flag} {unixOnly} {
+test messages-2.3 {web::msgflag set and test flag} {
set flag [web::msgflag multiple]
set res [web::msgflag $flag multiple]
} {1}
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org