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

Sort the resulting slice before the comparison.

Merge pull request #1268 from mholt/fix-files-test
Sort the resulting slice before the comparison.
8acf0432 · Matt Holt · GitHub · 8c392a02 · 98c17bcd · 8acf0432
Commit 8acf0432 authored Nov 19, 2016 by Matt Holt Committed by GitHub Nov 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

caddyhttp/httpserver/context_test.go caddyhttp/httpserver/context_test.go +7 -3

No files found.
--- a/caddyhttp/httpserver/context_test.go
+++ b/caddyhttp/httpserver/context_test.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -766,9 +767,12 @@ func TestFiles(t *testing.T) {
 			if numFiles == 0 && len(actual) != 0 {
 				t.Errorf(testPrefix+"Expected files %v, got: %v",
 					test.fileNames, actual)
-			} else if numFiles > 0 && !reflect.DeepEqual(test.fileNames, actual) {
+			} else {
-				t.Errorf(testPrefix+"Expected files %v, got: %v",
+				sort.Strings(actual)
-					test.fileNames, actual)
+				if numFiles > 0 && !reflect.DeepEqual(test.fileNames, actual) {
+					t.Errorf(testPrefix+"Expected files %v, got: %v",
+						test.fileNames, actual)
+				}
 			}
 		}