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

Sort the resulting slice before the comparison.

caddyhttp/httpserver/context_test.go

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