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

internal/initwd: allow tests to pass when $PWD contains symlinks (#26015) 

Fixes #26014
This commit is contained in:
Alan D. Salewski 2020-08-27 10:02:22 -04:00 committed by GitHub
parent 9699479601
commit f63c38d6a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/initwd/from_module_test.go
View File

@ -122,6 +122,17 @@ func TestDirFromModule_submodules(t *testing.T) {
t.Fatal(err)
}
// DirFromModule will expand ("canonicalize") the pathnames, so we must do
// the same for our "wantCalls" comparison values. Otherwise this test
// will fail when building in a source tree with symlinks in $PWD.
//
// See also: https://github.com/hashicorp/terraform/issues/26014
//
fromModuleDirRealpath, err := filepath.EvalSymlinks(fromModuleDir)
if err != nil {
t.Error(err)
}
tmpDir, done := tempChdir(t, fixtureDir)
defer done()
@ -138,12 +149,12 @@ func TestDirFromModule_submodules(t *testing.T) {
{
Name: "Install",
ModuleAddr: "child_a",
LocalPath: filepath.Join(fromModuleDir, "child_a"),
LocalPath: filepath.Join(fromModuleDirRealpath, "child_a"),
},
{
Name: "Install",
ModuleAddr: "child_a.child_b",
LocalPath: filepath.Join(fromModuleDir, "child_a/child_b"),
LocalPath: filepath.Join(fromModuleDirRealpath, "child_a/child_b"),
},
}