Fossil SCM
Set FOSSIL_USER in json tests to sort user related output consistently if run as a different user. Eases test result comparisons.
Commit
68ae97d4568c6da57232350ebbd3628611cdc61bfd8603f1bd42e327941e773a
Parent
0424384328fe54e…
1 file changed
+14
+14
| --- test/json.test | ||
| +++ test/json.test | ||
| @@ -177,10 +177,18 @@ | ||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | #### VERSION AKA HAI |
| 180 | 180 | |
| 181 | 181 | # The JSON API generally assumes we have a respository, so let it have one. |
| 182 | + | |
| 183 | +# Set FOSSIL_USER to ensure consistent results in "json user list" | |
| 184 | +set _fossil_user "" | |
| 185 | +if [info exists env(FOSSIL_USER)] { | |
| 186 | + set _fossil_user $env(FOSSIL_USER) | |
| 187 | +} | |
| 188 | +set ::env(FOSSIL_USER) "JSON-TEST-USER" | |
| 189 | + | |
| 182 | 190 | test_setup |
| 183 | 191 | |
| 184 | 192 | # Stop backoffice from running during this test as it can cause hangs. |
| 185 | 193 | fossil settings backoffice-disable 1 |
| 186 | 194 | |
| @@ -908,5 +916,11 @@ | ||
| 908 | 916 | } |
| 909 | 917 | |
| 910 | 918 | ############################################################################### |
| 911 | 919 | |
| 912 | 920 | test_cleanup |
| 921 | + | |
| 922 | +if { $_fossil_user eq "" } { | |
| 923 | + unset ::env(FOSSIL_USER) | |
| 924 | +} else { | |
| 925 | + set ::env(FOSSIL_USER) $_fossil_user | |
| 926 | +} | |
| 913 | 927 |
| --- test/json.test | |
| +++ test/json.test | |
| @@ -177,10 +177,18 @@ | |
| 177 | } |
| 178 | |
| 179 | #### VERSION AKA HAI |
| 180 | |
| 181 | # The JSON API generally assumes we have a respository, so let it have one. |
| 182 | test_setup |
| 183 | |
| 184 | # Stop backoffice from running during this test as it can cause hangs. |
| 185 | fossil settings backoffice-disable 1 |
| 186 | |
| @@ -908,5 +916,11 @@ | |
| 908 | } |
| 909 | |
| 910 | ############################################################################### |
| 911 | |
| 912 | test_cleanup |
| 913 |
| --- test/json.test | |
| +++ test/json.test | |
| @@ -177,10 +177,18 @@ | |
| 177 | } |
| 178 | |
| 179 | #### VERSION AKA HAI |
| 180 | |
| 181 | # The JSON API generally assumes we have a respository, so let it have one. |
| 182 | |
| 183 | # Set FOSSIL_USER to ensure consistent results in "json user list" |
| 184 | set _fossil_user "" |
| 185 | if [info exists env(FOSSIL_USER)] { |
| 186 | set _fossil_user $env(FOSSIL_USER) |
| 187 | } |
| 188 | set ::env(FOSSIL_USER) "JSON-TEST-USER" |
| 189 | |
| 190 | test_setup |
| 191 | |
| 192 | # Stop backoffice from running during this test as it can cause hangs. |
| 193 | fossil settings backoffice-disable 1 |
| 194 | |
| @@ -908,5 +916,11 @@ | |
| 916 | } |
| 917 | |
| 918 | ############################################################################### |
| 919 | |
| 920 | test_cleanup |
| 921 | |
| 922 | if { $_fossil_user eq "" } { |
| 923 | unset ::env(FOSSIL_USER) |
| 924 | } else { |
| 925 | set ::env(FOSSIL_USER) $_fossil_user |
| 926 | } |
| 927 |