summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2023-09-29 17:05:27 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2023-09-29 17:05:27 (GMT)
commit197397e5404aedf522c6f46f3a5f6dbc5086f65f (patch)
tree44d8ec9626a4210066a8ad226fb2fb9b172d8c74
parent5d2cc9aa8096c724098eaa68d33bdbdbf11fda3c (diff)
parent175280f0b6b58f352e476d8c930d42c2b5bb2fc4 (diff)
downloadtcl-197397e5404aedf522c6f46f3a5f6dbc5086f65f.zip
tcl-197397e5404aedf522c6f46f3a5f6dbc5086f65f.tar.gz
tcl-197397e5404aedf522c6f46f3a5f6dbc5086f65f.tar.bz2
Merge 8.7
-rw-r--r--tests/zipfs.test14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/zipfs.test b/tests/zipfs.test
index e7f8de9..64ce1eb 100644
--- a/tests/zipfs.test
+++ b/tests/zipfs.test
@@ -964,7 +964,7 @@ namespace eval test_ns_zipfs {
}
testzipfsread stored test.zip test test
- testzipfsread stored teststored.zip aaaaaaaaaaaaaa
+ testzipfsread stored-1 teststored.zip aaaaaaaaaaaaaa
testzipfsread deflate testdeflated2.zip aaaaaaaaaaaaaa
testzipfsread bug-23dd83ce7c empty.zip {} empty.txt
# Test open modes - see bug [4645658689]
@@ -1213,23 +1213,23 @@ namespace eval test_ns_zipfs {
} -body {
set fd [open [file join $defaultMountPoint $filename]]
gets $fd
- } -result $result {*}$args
+ } -result $result {*}$args -constraints bbe7c6ff9e
}
# The bug bbe7c6ff9e only manifests on macos
- testConstraint bug-bbe7c6ff9e [expr {$::tcl_platform(os) ne "Darwin"}]
+ testConstraint bbe7c6ff9e [expr {$::tcl_platform(os) ne "Darwin"}]
# NOTE: test-password.zip is the DOS time based encryption header validity check (infozip style)
# test-password2.zip is the CRC based encryption header validity check (pkware style)
testpasswordr plain test-password.zip plain.txt password plaintext
testpasswordr plain-nopass test-password.zip plain.txt "" plaintext
testpasswordr plain-badpass test-password.zip plain.txt badpassword plaintext
- testpasswordr cipher-1 test-password.zip cipher.bin password ciphertext -constraints bug-bbe7c6ff9e
- testpasswordr cipher-2 test-password2.zip cipher.bin password ciphertext -constraints bug-bbe7c6ff9e
+ testpasswordr cipher-1 test-password.zip cipher.bin password ciphertext
+ testpasswordr cipher-2 test-password2.zip cipher.bin password ciphertext
testpasswordr cipher-nopass-1 test-password.zip cipher.bin {} "decryption failed - no password provided" -returnCodes error
testpasswordr cipher-nopass-2 test-password2.zip cipher.bin {} "decryption failed - no password provided" -returnCodes error
testpasswordr cipher-badpass-1 test-password.zip cipher.bin badpassword "invalid password" -returnCodes error
testpasswordr cipher-badpass-2 test-password2.zip cipher.bin badpassword "invalid password" -returnCodes error
- testpasswordr cipher-deflate test-password.zip cipher-deflate.bin password [lseq 100] -constraints bug-bbe7c6ff9e
+ testpasswordr cipher-deflate test-password.zip cipher-deflate.bin password [lseq 100]
testpasswordr cipher-deflate-nopass test-password.zip cipher-deflate.bin {} "decryption failed - no password provided" -returnCodes error
testpasswordr cipher-deflate-badpass test-password.zip cipher-deflate.bin badpassword "invalid password" -returnCodes error
@@ -1259,7 +1259,7 @@ namespace eval test_ns_zipfs {
close $fd
}
cleanup
- } -body $body -result $result {*}$args
+ } -body $body -result $result {*}$args -constraints bbe7c6ff9e
}
# NOTE: test-password.zip is the DOS time based encryption header validity check (infozip style)
# test-password2.zip is the CRC based encryption header validity check (pkware style)