0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00

Sort the resulting slice before the comparison.

This commit is contained in:
ericdreeves 2016-11-19 08:37:36 -06:00
parent 8c392a02c8
commit 98c17bcdf2

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) {