1 files changed, 31 insertions, 5 deletions

diff --git a/vendor/github.com/hashicorp/go-getter/decompress_testing.go b/vendor/github.com/hashicorp/go-getter/decompress_testing.go
index 686d6c2..91cf33d 100644
--- a/vendor/github.com/hashicorp/go-getter/decompress_testing.go
+++ b/vendor/github.com/hashicorp/go-getter/decompress_testing.go
@@ -11,7 +11,9 @@ import (
         "runtime"
         "sort"
         "strings"
-        "testing"
+        "time"
+
+        "github.com/mitchellh/go-testing-interface"
 )
 
 // TestDecompressCase is a single test case for testing decompressors
@@ -21,10 +23,11 @@ type TestDecompressCase struct {
         Err     bool     // Err is whether we expect an error or not
         DirList []string // DirList is the list of files for Dir mode
         FileMD5 string   // FileMD5 is the expected MD5 for a single file
+        Mtime *time.Time // Mtime is the optionally expected mtime for a single file (or all files if in Dir mode)
 }
 
 // TestDecompressor is a helper function for testing generic decompressors.
-func TestDecompressor(t *testing.T, d Decompressor, cases []TestDecompressCase) {
+func TestDecompressor(t testing.T, d Decompressor, cases []TestDecompressCase) {
         for _, tc := range cases {
                 t.Logf("Testing: %s", tc.Input)
 
@@ -67,6 +70,14 @@ func TestDecompressor(t *testing.T, d Decompressor, cases []TestDecompressCase)
                                         }
                                 }
 
+                                if tc.Mtime != nil {
+                                        actual := fi.ModTime()
+                                        expected := *tc.Mtime
+                                        if actual != expected {
+                                                t.Fatalf("err %s: expected mtime '%s' for %s, got '%s'", tc.Input, expected.String(), dst, actual.String())
+                                        }
+                                }
+
                                 return
                         }
 
@@ -83,11 +94,26 @@ func TestDecompressor(t *testing.T, d Decompressor, cases []TestDecompressCase)
                         if !reflect.DeepEqual(actual, expected) {
                                 t.Fatalf("bad %s\n\n%#v\n\n%#v", tc.Input, actual, expected)
                         }
+                        // Check for correct atime/mtime
+                        for _, dir := range actual {
+                                path := filepath.Join(dst, dir)
+                                if tc.Mtime != nil {
+                                        fi, err := os.Stat(path)
+                                        if err != nil {
+                                                t.Fatalf("err: %s", err)
+                                        }
+                                        actual := fi.ModTime()
+                                        expected := *tc.Mtime
+                                        if actual != expected {
+                                                t.Fatalf("err %s: expected mtime '%s' for %s, got '%s'", tc.Input, expected.String(), path, actual.String())
+                                        }
+                                }
+                        }
                 }()
         }
 }
 
-func testListDir(t *testing.T, path string) []string {
+func testListDir(t testing.T, path string) []string {
         var result []string
         err := filepath.Walk(path, func(sub string, info os.FileInfo, err error) error {
                 if err != nil {
@@ -102,7 +128,7 @@ func testListDir(t *testing.T, path string) []string {
 
                 // If it is a dir, add trailing sep
                 if info.IsDir() {
-                        sub += "/"
+                        sub += string(os.PathSeparator)
                 }
 
                 result = append(result, sub)
@@ -116,7 +142,7 @@ func testListDir(t *testing.T, path string) []string {
         return result
 }
 
-func testMD5(t *testing.T, path string) string {
+func testMD5(t testing.T, path string) string {
         f, err := os.Open(path)
         if err != nil {
                 t.Fatalf("err: %s", err)