ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27005 from hashicorp/jbardin/provider-cache-test 

Fix providercache tests on MacOS
This commit is contained in:
James Bardin 2020-11-23 15:58:11 -05:00 committed by GitHub
parent a44a50a8b5 7eb491719f
commit f6d6446701
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/providercache/installer_test.go
View File

@ -208,7 +208,7 @@ func TestEnsureProviderVersions(t *testing.T) {
nil, nil,
), ),
Prepare: func(t *testing.T, inst *Installer, dir *Dir) { Prepare: func(t *testing.T, inst *Installer, dir *Dir) {
globalCacheDirPath := t.TempDir() globalCacheDirPath := tmpDir(t)
globalCacheDir := NewDirWithPlatform(globalCacheDirPath, fakePlatform) globalCacheDir := NewDirWithPlatform(globalCacheDirPath, fakePlatform)
inst.SetGlobalCacheDir(globalCacheDir) inst.SetGlobalCacheDir(globalCacheDir)
}, },
@ -327,7 +327,7 @@ func TestEnsureProviderVersions(t *testing.T) {
nil, nil,
), ),
Prepare: func(t *testing.T, inst *Installer, dir *Dir) { Prepare: func(t *testing.T, inst *Installer, dir *Dir) {
globalCacheDirPath := t.TempDir() globalCacheDirPath := tmpDir(t)
globalCacheDir := NewDirWithPlatform(globalCacheDirPath, fakePlatform) globalCacheDir := NewDirWithPlatform(globalCacheDirPath, fakePlatform)
_, err := globalCacheDir.InstallPackage( _, err := globalCacheDir.InstallPackage(
context.Background(), context.Background(),
@ -1149,7 +1149,7 @@ func TestEnsureProviderVersions(t *testing.T) {
t.Fatalf("invalid test: must set at least one of Check, WantEvents, or WantErr") t.Fatalf("invalid test: must set at least one of Check, WantEvents, or WantErr")
} }
outputDir := NewDirWithPlatform(t.TempDir(), fakePlatform) outputDir := NewDirWithPlatform(tmpDir(t), fakePlatform)
source := test.Source source := test.Source
if source == nil { if source == nil {
source = getproviders.NewMockSource(nil, nil) source = getproviders.NewMockSource(nil, nil)
@ -1629,3 +1629,14 @@ func fakeRegistryHandler(resp http.ResponseWriter, req *http.Request) {
resp.WriteHeader(404) resp.WriteHeader(404)
resp.Write([]byte(`unrecognized path scheme`)) resp.Write([]byte(`unrecognized path scheme`))
} }
// In order to be able to compare the recorded temp dir paths, we need to
// normalize the path to match what the installer would report.
func tmpDir(t *testing.T) string {
d := t.TempDir()
unlinked, err := filepath.EvalSymlinks(d)
if err != nil {
t.Fatal(err)
}
return filepath.Clean(unlinked)
}