Merge pull request #190 from hashicorp/testdata-dir

Use standard name for fixtures dir per Go conventions

README.md

@@ -128,14 +128,14 @@ go-getter will first download the URL specified _before_ the double-slash
 path after the double slash into the target directory.
 
 For example, if you're downloading this GitHub repository, but you only
-want to download the `test-fixtures` directory, you can do the following:
+want to download the `testdata` directory, you can do the following:
 
 ```
-https://github.com/hashicorp/go-getter.git//test-fixtures
+https://github.com/hashicorp/go-getter.git//testdata
 ```
 
 If you downloaded this to the `/tmp` directory, then the file
-`/tmp/archive.gz` would exist. Notice that this file is in the `test-fixtures`
+`/tmp/archive.gz` would exist. Notice that this file is in the `testdata`
 directory in this repository, but because we specified a subdirectory,
 go-getter automatically copied only that directory contents.
 

decompress_bzip2_test.go

@@ -27,7 +27,7 @@ func TestBzip2Decompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-bz2", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-bz2", tc.Input)
 	}
 
 	TestDecompressor(t, new(Bzip2Decompressor), cases)

decompress_gzip_test.go

@@ -27,7 +27,7 @@ func TestGzipDecompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-gz", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-gz", tc.Input)
 	}
 
 	TestDecompressor(t, new(GzipDecompressor), cases)

decompress_tar_test.go

@@ -36,7 +36,7 @@ func TestTar(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-tar", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-tar", tc.Input)
 	}
 
 	TestDecompressor(t, new(tarDecompressor), cases)

decompress_tbz2_test.go

@@ -66,7 +66,7 @@ func TestTarBzip2Decompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-tbz2", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-tbz2", tc.Input)
 	}
 
 	TestDecompressor(t, new(TarBzip2Decompressor), cases)

decompress_tgz_test.go

@@ -88,7 +88,7 @@ func TestTarGzipDecompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-tgz", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-tgz", tc.Input)
 	}
 
 	TestDecompressor(t, new(TarGzipDecompressor), cases)

decompress_txz_test.go

@@ -77,7 +77,7 @@ func TestTarXzDecompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-txz", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-txz", tc.Input)
 	}
 
 	TestDecompressor(t, new(TarXzDecompressor), cases)

decompress_xz_test.go

@@ -27,7 +27,7 @@ func TestXzDecompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-xz", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-xz", tc.Input)
 	}
 
 	TestDecompressor(t, new(XzDecompressor), cases)

decompress_zip_test.go

@@ -91,7 +91,7 @@ func TestZipDecompressor(t *testing.T) {
 	}
 
 	for i, tc := range cases {
-		cases[i].Input = filepath.Join("./test-fixtures", "decompress-zip", tc.Input)
+		cases[i].Input = filepath.Join("./testdata", "decompress-zip", tc.Input)
 	}
 
 	TestDecompressor(t, new(ZipDecompressor), cases)

detect_file_test.go

@@ -21,8 +21,8 @@ var fileTests = []fileTest{
 }
 
 var unixFileTests = []fileTest{
-	{"./foo", "test-fixtures/detect-file-symlink-pwd/syml/pwd",
-		"test-fixtures/detect-file-symlink-pwd/real/foo", false},
+	{"./foo", "testdata/detect-file-symlink-pwd/syml/pwd",
+		"testdata/detect-file-symlink-pwd/real/foo", false},
 
 	{"/foo", "/pwd", "file:///foo", false},
 	{"/foo?bar=baz", "/pwd", "file:///foo?bar=baz", false},

get_test.go

@@ -63,7 +63,7 @@ func TestGet_filePercent2F(t *testing.T) {
 
 func TestGet_fileDetect(t *testing.T) {
 	dst := tempDir(t)
-	u := filepath.Join(".", "test-fixtures", "basic")
+	u := filepath.Join(".", "testdata", "basic")
 	pwd, err := os.Getwd()
 	if err != nil {
 		t.Fatalf("err: %s", err)
@@ -121,7 +121,7 @@ func TestGet_fileSubdir(t *testing.T) {
 
 func TestGet_archive(t *testing.T) {
 	dst := tempDir(t)
-	u := filepath.Join("./test-fixtures", "archive.tar.gz")
+	u := filepath.Join("./testdata", "archive.tar.gz")
 	u, _ = filepath.Abs(u)
 
 	if err := Get(dst, u); err != nil {
@@ -136,7 +136,7 @@ func TestGet_archive(t *testing.T) {
 
 func TestGetAny_archive(t *testing.T) {
 	dst := tempDir(t)
-	u := filepath.Join("./test-fixtures", "archive.tar.gz")
+	u := filepath.Join("./testdata", "archive.tar.gz")
 	u, _ = filepath.Abs(u)
 
 	if err := GetAny(dst, u); err != nil {
@@ -203,7 +203,7 @@ func TestGetAny_file(t *testing.T) {
 
 func TestGetAny_dir(t *testing.T) {
 	dst := tempDir(t)
-	u := filepath.Join("./test-fixtures", "basic")
+	u := filepath.Join("./testdata", "basic")
 	u, _ = filepath.Abs(u)
 
 	if err := GetAny(dst, u); err != nil {

module_test.go

@@ -13,7 +13,7 @@ import (
 	urlhelper "github.com/hashicorp/go-getter/helper/url"
 )
 
-const fixtureDir = "./test-fixtures"
+const fixtureDir = "./testdata"
 
 func tempDir(t *testing.T) string {
 	dir, err := ioutil.TempDir("", "tf")

netrc_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestAddAuthFromNetrc(t *testing.T) {
-	defer tempEnv(t, "NETRC", "./test-fixtures/netrc/basic")()
+	defer tempEnv(t, "NETRC", "./testdata/netrc/basic")()
 
 	u, err := url.Parse("http://example.com")
 	if err != nil {
@@ -25,7 +25,7 @@ func TestAddAuthFromNetrc(t *testing.T) {
 }
 
 func TestAddAuthFromNetrc_hasAuth(t *testing.T) {
-	defer tempEnv(t, "NETRC", "./test-fixtures/netrc/basic")()
+	defer tempEnv(t, "NETRC", "./testdata/netrc/basic")()
 
 	u, err := url.Parse("http://username:password@example.com")
 	if err != nil {
@@ -44,7 +44,7 @@ func TestAddAuthFromNetrc_hasAuth(t *testing.T) {
 }
 
 func TestAddAuthFromNetrc_hasUsername(t *testing.T) {
-	defer tempEnv(t, "NETRC", "./test-fixtures/netrc/basic")()
+	defer tempEnv(t, "NETRC", "./testdata/netrc/basic")()
 
 	u, err := url.Parse("http://username@example.com")
 	if err != nil {