github-mirror/caddy
github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-01 09:24:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1268 from mholt/fix-files-test

Browse Source 
Sort the resulting slice before the comparison.
This commit is contained in:
Matt Holt 2016-11-19 08:47:53 -07:00 committed by GitHub
commit 8acf043297
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddyhttp/httpserver/context_test.go
View File

@ -9,6 +9,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"sort"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -766,11 +767,14 @@ func TestFiles(t *testing.T) {
if numFiles == 0 && len(actual) != 0 { if numFiles == 0 && len(actual) != 0 {
t.Errorf(testPrefix+"Expected files %v, got: %v", t.Errorf(testPrefix+"Expected files %v, got: %v",
test.fileNames, actual) test.fileNames, actual)
} else if numFiles > 0 && !reflect.DeepEqual(test.fileNames, actual) { } else {
sort.Strings(actual)
if numFiles > 0 && !reflect.DeepEqual(test.fileNames, actual) {
t.Errorf(testPrefix+"Expected files %v, got: %v", t.Errorf(testPrefix+"Expected files %v, got: %v",
test.fileNames, actual) test.fileNames, actual)
} }
} }
}
if dirPath != "" { if dirPath != "" {
if err := os.RemoveAll(dirPath); err != nil && !os.IsNotExist(err) { if err := os.RemoveAll(dirPath); err != nil && !os.IsNotExist(err) {