Fossil SCM
Updates to the 'th1' tests.
Commit
93f42413a2ea2e5ffed94d8be22aedaed07858767bfbb451ada521caef859bd2
Parent
5b1b25b4a95df3d…
1 file changed
+11
-10
+11
-10
| --- test/th1.test | ||
| +++ test/th1.test | ||
| @@ -563,12 +563,13 @@ | ||
| 563 | 563 | puts "Skipping th1-anycap-*-1 perm tests: uncommitted changes in Fossil checkout." |
| 564 | 564 | } else { |
| 565 | 565 | set skip_anycap 0 |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | +# NOTE: The 'd' permission is no longer used. | |
| 568 | 569 | foreach perm [list \ |
| 569 | - a b c d e f g h i j k l m n o p q r s t u v w x y z \ | |
| 570 | + a b c e f g h i j k l m n o p q r s t u v w x y z \ | |
| 570 | 571 | A D \ |
| 571 | 572 | 2 3 4 5 6 7 ] { |
| 572 | 573 | if {$perm eq "u"} continue; # NOTE: Skip "reader" meta-permission. |
| 573 | 574 | if {$perm eq "v"} continue; # NOTE: Skip "developer" meta-permission. |
| 574 | 575 | |
| @@ -792,11 +793,11 @@ | ||
| 792 | 793 | test th1-footer-2 {$RESULT eq {}} |
| 793 | 794 | |
| 794 | 795 | ############################################################################### |
| 795 | 796 | |
| 796 | 797 | fossil test-th-eval --open-config --cgi "styleHeader {}; styleFooter" |
| 797 | -test th1-footer-3 {[regexp -- {</body></html>} $RESULT]} | |
| 798 | +test th1-footer-3 {[regexp -- {</body>\n</html>} $RESULT]} | |
| 798 | 799 | |
| 799 | 800 | ############################################################################### |
| 800 | 801 | |
| 801 | 802 | fossil test-th-eval "getParameter" |
| 802 | 803 | test th1-get-parameter-1 {$RESULT eq \ |
| @@ -1035,18 +1036,18 @@ | ||
| 1035 | 1036 | # |
| 1036 | 1037 | fossil test-th-eval "info commands" |
| 1037 | 1038 | set sorted_result [lsort $RESULT] |
| 1038 | 1039 | protOut "Sorted: $sorted_result" |
| 1039 | 1040 | set base_commands {anoncap anycap array artifact break breakpoint catch\ |
| 1040 | - cgiHeaderLine checkout combobox continue date decorate dir enable_output \ | |
| 1041 | - encode64 error expr for getParameter glob_match globalState hascap \ | |
| 1042 | - hasfeature html htmlize http httpize if info insertCsrf lindex linecount \ | |
| 1043 | - list llength lsearch markdown nonce proc puts query randhex redirect\ | |
| 1044 | - regexp reinitialize rename render repository return searchable set\ | |
| 1045 | - setParameter setting stime string styleFooter styleHeader styleScript\ | |
| 1046 | - tclReady trace unset unversioned uplevel upvar utime verifyCsrf\ | |
| 1047 | - verifyLogin wiki} | |
| 1041 | + cgiHeaderLine checkout combobox continue copybtn date decorate dir \ | |
| 1042 | + enable_output encode64 error expr for getParameter glob_match \ | |
| 1043 | + globalState hascap hasfeature html htmlize http httpize if info \ | |
| 1044 | + insertCsrf lindex linecount list llength lsearch markdown nonce proc \ | |
| 1045 | + puts query randhex redirect regexp reinitialize rename render \ | |
| 1046 | + repository return searchable set setParameter setting stime string \ | |
| 1047 | + styleFooter styleHeader styleScript tclReady trace unset unversioned \ | |
| 1048 | + uplevel upvar utime verifyCsrf verifyLogin wiki} | |
| 1048 | 1049 | set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe} |
| 1049 | 1050 | if {$th1Tcl} { |
| 1050 | 1051 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]} |
| 1051 | 1052 | } else { |
| 1052 | 1053 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands"]} |
| 1053 | 1054 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -563,12 +563,13 @@ | |
| 563 | puts "Skipping th1-anycap-*-1 perm tests: uncommitted changes in Fossil checkout." |
| 564 | } else { |
| 565 | set skip_anycap 0 |
| 566 | } |
| 567 | |
| 568 | foreach perm [list \ |
| 569 | a b c d e f g h i j k l m n o p q r s t u v w x y z \ |
| 570 | A D \ |
| 571 | 2 3 4 5 6 7 ] { |
| 572 | if {$perm eq "u"} continue; # NOTE: Skip "reader" meta-permission. |
| 573 | if {$perm eq "v"} continue; # NOTE: Skip "developer" meta-permission. |
| 574 | |
| @@ -792,11 +793,11 @@ | |
| 792 | test th1-footer-2 {$RESULT eq {}} |
| 793 | |
| 794 | ############################################################################### |
| 795 | |
| 796 | fossil test-th-eval --open-config --cgi "styleHeader {}; styleFooter" |
| 797 | test th1-footer-3 {[regexp -- {</body></html>} $RESULT]} |
| 798 | |
| 799 | ############################################################################### |
| 800 | |
| 801 | fossil test-th-eval "getParameter" |
| 802 | test th1-get-parameter-1 {$RESULT eq \ |
| @@ -1035,18 +1036,18 @@ | |
| 1035 | # |
| 1036 | fossil test-th-eval "info commands" |
| 1037 | set sorted_result [lsort $RESULT] |
| 1038 | protOut "Sorted: $sorted_result" |
| 1039 | set base_commands {anoncap anycap array artifact break breakpoint catch\ |
| 1040 | cgiHeaderLine checkout combobox continue date decorate dir enable_output \ |
| 1041 | encode64 error expr for getParameter glob_match globalState hascap \ |
| 1042 | hasfeature html htmlize http httpize if info insertCsrf lindex linecount \ |
| 1043 | list llength lsearch markdown nonce proc puts query randhex redirect\ |
| 1044 | regexp reinitialize rename render repository return searchable set\ |
| 1045 | setParameter setting stime string styleFooter styleHeader styleScript\ |
| 1046 | tclReady trace unset unversioned uplevel upvar utime verifyCsrf\ |
| 1047 | verifyLogin wiki} |
| 1048 | set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe} |
| 1049 | if {$th1Tcl} { |
| 1050 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]} |
| 1051 | } else { |
| 1052 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands"]} |
| 1053 |
| --- test/th1.test | |
| +++ test/th1.test | |
| @@ -563,12 +563,13 @@ | |
| 563 | puts "Skipping th1-anycap-*-1 perm tests: uncommitted changes in Fossil checkout." |
| 564 | } else { |
| 565 | set skip_anycap 0 |
| 566 | } |
| 567 | |
| 568 | # NOTE: The 'd' permission is no longer used. |
| 569 | foreach perm [list \ |
| 570 | a b c e f g h i j k l m n o p q r s t u v w x y z \ |
| 571 | A D \ |
| 572 | 2 3 4 5 6 7 ] { |
| 573 | if {$perm eq "u"} continue; # NOTE: Skip "reader" meta-permission. |
| 574 | if {$perm eq "v"} continue; # NOTE: Skip "developer" meta-permission. |
| 575 | |
| @@ -792,11 +793,11 @@ | |
| 793 | test th1-footer-2 {$RESULT eq {}} |
| 794 | |
| 795 | ############################################################################### |
| 796 | |
| 797 | fossil test-th-eval --open-config --cgi "styleHeader {}; styleFooter" |
| 798 | test th1-footer-3 {[regexp -- {</body>\n</html>} $RESULT]} |
| 799 | |
| 800 | ############################################################################### |
| 801 | |
| 802 | fossil test-th-eval "getParameter" |
| 803 | test th1-get-parameter-1 {$RESULT eq \ |
| @@ -1035,18 +1036,18 @@ | |
| 1036 | # |
| 1037 | fossil test-th-eval "info commands" |
| 1038 | set sorted_result [lsort $RESULT] |
| 1039 | protOut "Sorted: $sorted_result" |
| 1040 | set base_commands {anoncap anycap array artifact break breakpoint catch\ |
| 1041 | cgiHeaderLine checkout combobox continue copybtn date decorate dir \ |
| 1042 | enable_output encode64 error expr for getParameter glob_match \ |
| 1043 | globalState hascap hasfeature html htmlize http httpize if info \ |
| 1044 | insertCsrf lindex linecount list llength lsearch markdown nonce proc \ |
| 1045 | puts query randhex redirect regexp reinitialize rename render \ |
| 1046 | repository return searchable set setParameter setting stime string \ |
| 1047 | styleFooter styleHeader styleScript tclReady trace unset unversioned \ |
| 1048 | uplevel upvar utime verifyCsrf verifyLogin wiki} |
| 1049 | set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe} |
| 1050 | if {$th1Tcl} { |
| 1051 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]} |
| 1052 | } else { |
| 1053 | test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands"]} |
| 1054 |