mirror of
https://github.com/caddyserver/caddy.git
synced 2025-05-23 19:10:03 +08:00
Fix test failures on Windows.
Most of the Windows test failures are due to the path separator not being "/". The general approach I took here was to keep paths in "URL form" (ie using "/" separators) as much as possible, and only convert to native paths when we attempt to open a file. This will allow the most consistency between different host OS. For example, data structures that store paths still store them with "/" delimiters. Functions that accepted paths as input and return them as outputs still use "/". There are still a few test failures that need to be sorted out. - config/setup/TestRoot (I hear this has already been fixed by someone else) - middleware/basicauth/TestBrowseTemplate and middleware/templates/Test (a line endings issue that I'm still working through)
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
)
|
||||
@ -15,13 +16,17 @@ func TestIndexfile(t *testing.T) {
|
||||
expectedBoolValue bool //return value
|
||||
}{
|
||||
{
|
||||
http.Dir("./templates/testdata"), "/images/", []string{"img.htm"},
|
||||
http.Dir("./templates/testdata"),
|
||||
"/images/",
|
||||
[]string{"img.htm"},
|
||||
false,
|
||||
"/images/img.htm", true,
|
||||
"/images/img.htm",
|
||||
true,
|
||||
},
|
||||
}
|
||||
for i, test := range tests {
|
||||
actualFilePath, actualBoolValue := IndexFile(test.rootDir, test.fpath, test.indexFiles)
|
||||
fmt.Println("ZBZB IndexFile returned", actualFilePath, ",", actualBoolValue)
|
||||
if actualBoolValue == true && test.shouldErr {
|
||||
t.Errorf("Test %d didn't error, but it should have", i)
|
||||
} else if actualBoolValue != true && !test.shouldErr {
|
||||
|
Reference in New Issue
Block a user