Fossil SCM

Fix th1.test: changed trace log output; changed HTML header; new TH1 commands.

florian 2023-11-05 12:55 test-fixes-2.24
Commit 2660ad0f3501f7f819351951c4dd3b1c05223916bff2408339abc9f2c591d99d
Parent cb9106b2800a68d…
1 file changed +13 -11
~ test/th1.test
M test/th1.test
+13 -11
--- test/th1.test
+++ test/th1.test
@@ -739,18 +739,18 @@
739739
 $normalized_result {} normalized_result
740740
741741
 if {$th1Hooks} {
742742
 test th1-trace-2 {$normalized_result eq \
743743
 {------------------ BEGIN TRACE LOG ------------------
744
-th1-init 0x0 => 0x0<br />
744
+th1-init 0x0 => 0x0<br>
745745
746746
 ------------------- END TRACE LOG -------------------}}
747747
 } else {
748748
 test th1-trace-2 {$normalized_result eq \
749749
 {------------------ BEGIN TRACE LOG ------------------
750
-th1-init 0x0 => 0x0<br />
751
-th1-setup {} => TH_OK<br />
750
+th1-init 0x0 => 0x0<br>
751
+th1-setup {} => TH_OK<br>
752752
753753
 ------------------- END TRACE LOG -------------------}}
754754
 }
755755
756756
 ###############################################################################
@@ -767,18 +767,18 @@
767767
 $normalized_result {} normalized_result
768768
769769
 if {$th1Hooks} {
770770
 test th1-trace-4 {$normalized_result eq \
771771
 {------------------ BEGIN TRACE LOG ------------------
772
-th1-init 0x0 => 0x0<br />
772
+th1-init 0x0 => 0x0<br>
773773
 this is a trace message.
774774
 ------------------- END TRACE LOG -------------------}}
775775
 } else {
776776
 test th1-trace-4 {$normalized_result eq \
777777
 {------------------ BEGIN TRACE LOG ------------------
778
-th1-init 0x0 => 0x0<br />
779
-th1-setup {} => TH_OK<br />
778
+th1-init 0x0 => 0x0<br>
779
+th1-setup {} => TH_OK<br>
780780
 this is a trace message.
781781
 ------------------- END TRACE LOG -------------------}}
782782
 }
783783
784784
 ###############################################################################
@@ -789,11 +789,13 @@
789789
790790
 ###############################################################################
791791
792792
 fossil test-th-eval "defHeader"
793793
 test th1-defHeader-2 {[string match *<body> [normalize_result]] || \
794
- [string match "*<body class=\"\$current_feature\">" [normalize_result]]}
794
+ [string match "*<body class=\"\$current_feature\
795
+ rpage-\$requested_page\
796
+ cpage-\$canonical_page\">" [normalize_result]]}
795797
796798
 ###############################################################################
797799
798800
 fossil test-th-eval "styleHeader {Page Title Here}"
799801
 test th1-header-1 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -1062,14 +1064,14 @@
10621064
 set base_commands {anoncap anycap array artifact break breakpoint \
10631065
 builtin_request_js capexpr captureTh1 catch cgiHeaderLine checkout \
10641066
 combobox continue copybtn date decorate defHeader dir enable_htmlify \
10651067
 enable_output encode64 error expr for foreach getParameter glob_match \
10661068
 globalState hascap hasfeature html htmlize http httpize if info \
1067
- insertCsrf lappend lindex linecount list llength lsearch markdown \
1068
- nonce proc puts query randhex redirect regexp reinitialize rename \
1069
- render repository return searchable set setParameter setting stime \
1070
- string styleFooter styleHeader styleScript tclReady trace unset \
1069
+ insertCsrf lappend lindex linecount list llength lsearch markdown nonce \
1070
+ proc puts query randhex redirect regexp reinitialize rename render \
1071
+ repository return searchable set setParameter setting stime string \
1072
+ styleFooter styleHeader styleScript submenu tclReady trace unset \
10711073
 unversioned uplevel upvar utime verifyCsrf verifyLogin wiki}
10721074
 set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe}
10731075
 if {$th1Tcl} {
10741076
 test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]}
10751077
 } else {
10761078
--- test/th1.test
+++ test/th1.test
@@ -739,18 +739,18 @@
739 $normalized_result {} normalized_result
740
741 if {$th1Hooks} {
742 test th1-trace-2 {$normalized_result eq \
743 {------------------ BEGIN TRACE LOG ------------------
744 th1-init 0x0 => 0x0<br />
745
746 ------------------- END TRACE LOG -------------------}}
747 } else {
748 test th1-trace-2 {$normalized_result eq \
749 {------------------ BEGIN TRACE LOG ------------------
750 th1-init 0x0 => 0x0<br />
751 th1-setup {} => TH_OK<br />
752
753 ------------------- END TRACE LOG -------------------}}
754 }
755
756 ###############################################################################
@@ -767,18 +767,18 @@
767 $normalized_result {} normalized_result
768
769 if {$th1Hooks} {
770 test th1-trace-4 {$normalized_result eq \
771 {------------------ BEGIN TRACE LOG ------------------
772 th1-init 0x0 => 0x0<br />
773 this is a trace message.
774 ------------------- END TRACE LOG -------------------}}
775 } else {
776 test th1-trace-4 {$normalized_result eq \
777 {------------------ BEGIN TRACE LOG ------------------
778 th1-init 0x0 => 0x0<br />
779 th1-setup {} => TH_OK<br />
780 this is a trace message.
781 ------------------- END TRACE LOG -------------------}}
782 }
783
784 ###############################################################################
@@ -789,11 +789,13 @@
789
790 ###############################################################################
791
792 fossil test-th-eval "defHeader"
793 test th1-defHeader-2 {[string match *<body> [normalize_result]] || \
794 [string match "*<body class=\"\$current_feature\">" [normalize_result]]}
 
 
795
796 ###############################################################################
797
798 fossil test-th-eval "styleHeader {Page Title Here}"
799 test th1-header-1 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -1062,14 +1064,14 @@
1062 set base_commands {anoncap anycap array artifact break breakpoint \
1063 builtin_request_js capexpr captureTh1 catch cgiHeaderLine checkout \
1064 combobox continue copybtn date decorate defHeader dir enable_htmlify \
1065 enable_output encode64 error expr for foreach getParameter glob_match \
1066 globalState hascap hasfeature html htmlize http httpize if info \
1067 insertCsrf lappend lindex linecount list llength lsearch markdown \
1068 nonce proc puts query randhex redirect regexp reinitialize rename \
1069 render repository return searchable set setParameter setting stime \
1070 string styleFooter styleHeader styleScript tclReady trace unset \
1071 unversioned uplevel upvar utime verifyCsrf verifyLogin wiki}
1072 set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe}
1073 if {$th1Tcl} {
1074 test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]}
1075 } else {
1076
--- test/th1.test
+++ test/th1.test
@@ -739,18 +739,18 @@
739 $normalized_result {} normalized_result
740
741 if {$th1Hooks} {
742 test th1-trace-2 {$normalized_result eq \
743 {------------------ BEGIN TRACE LOG ------------------
744 th1-init 0x0 => 0x0<br>
745
746 ------------------- END TRACE LOG -------------------}}
747 } else {
748 test th1-trace-2 {$normalized_result eq \
749 {------------------ BEGIN TRACE LOG ------------------
750 th1-init 0x0 => 0x0<br>
751 th1-setup {} => TH_OK<br>
752
753 ------------------- END TRACE LOG -------------------}}
754 }
755
756 ###############################################################################
@@ -767,18 +767,18 @@
767 $normalized_result {} normalized_result
768
769 if {$th1Hooks} {
770 test th1-trace-4 {$normalized_result eq \
771 {------------------ BEGIN TRACE LOG ------------------
772 th1-init 0x0 => 0x0<br>
773 this is a trace message.
774 ------------------- END TRACE LOG -------------------}}
775 } else {
776 test th1-trace-4 {$normalized_result eq \
777 {------------------ BEGIN TRACE LOG ------------------
778 th1-init 0x0 => 0x0<br>
779 th1-setup {} => TH_OK<br>
780 this is a trace message.
781 ------------------- END TRACE LOG -------------------}}
782 }
783
784 ###############################################################################
@@ -789,11 +789,13 @@
789
790 ###############################################################################
791
792 fossil test-th-eval "defHeader"
793 test th1-defHeader-2 {[string match *<body> [normalize_result]] || \
794 [string match "*<body class=\"\$current_feature\
795 rpage-\$requested_page\
796 cpage-\$canonical_page\">" [normalize_result]]}
797
798 ###############################################################################
799
800 fossil test-th-eval "styleHeader {Page Title Here}"
801 test th1-header-1 {$RESULT eq {TH_ERROR: repository unavailable}}
@@ -1062,14 +1064,14 @@
1064 set base_commands {anoncap anycap array artifact break breakpoint \
1065 builtin_request_js capexpr captureTh1 catch cgiHeaderLine checkout \
1066 combobox continue copybtn date decorate defHeader dir enable_htmlify \
1067 enable_output encode64 error expr for foreach getParameter glob_match \
1068 globalState hascap hasfeature html htmlize http httpize if info \
1069 insertCsrf lappend lindex linecount list llength lsearch markdown nonce \
1070 proc puts query randhex redirect regexp reinitialize rename render \
1071 repository return searchable set setParameter setting stime string \
1072 styleFooter styleHeader styleScript submenu tclReady trace unset \
1073 unversioned uplevel upvar utime verifyCsrf verifyLogin wiki}
1074 set tcl_commands {tclEval tclExpr tclInvoke tclIsSafe tclMakeSafe}
1075 if {$th1Tcl} {
1076 test th1-info-commands-1 {$sorted_result eq [lsort "$base_commands $tcl_commands"]}
1077 } else {
1078

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button