jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-19 17:59:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: internal/initwd tests on Windows (#3291)

Browse Source
This commit is contained in:
Diógenes Fernandes
2025-09-30 15:07:43 -03:00
committed by GitHub
parent 4fbbea6f4b
commit bdcf1f5e6e
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
internal/initwd/from_module_test.go
View File

@@ -135,31 +135,28 @@ func TestDirFromModule_registry(t *testing.T) {
} }
func TestDirFromModule_submodules(t *testing.T) { func TestDirFromModule_submodules(t *testing.T) {
fixtureDir := filepath.Clean("testdata/empty") fromModuleDir := tempChdir(t, "testdata/local-modules")
fromModuleDir, err := filepath.Abs("./testdata/local-modules") // EvalSymlinks expands short paths to full paths on Windows, e.g.:
// C:\RUNN~1\T... -> C:\runneradmin\T...
// fromModuleDir is used as a copy of the original directory, in order
// to avoid mount problems on Windows Github runners.
fromModuleDir, err := filepath.EvalSymlinks(fromModuleDir)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// DirFromModule will expand ("canonicalize") the pathnames, so we must do // Create a different temporary directory to install the modules in
// the same for our "wantCalls" comparison values. Otherwise this test tmpDir := t.TempDir()
// 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 := tempChdir(t, fixtureDir)
hooks := &testInstallHooks{} hooks := &testInstallHooks{}
dir, err := filepath.EvalSymlinks(tmpDir) dir := filepath.Join(tmpDir, "empty")
err = os.Mkdir(dir, os.ModePerm)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
modInstallDir := filepath.Join(dir, ".terraform/modules")
modInstallDir := filepath.Join(tmpDir, ".terraform/modules")
loader := configload.NewLoaderForTests(t) loader := configload.NewLoaderForTests(t)
diags := DirFromModule( diags := DirFromModule(
@@ -181,12 +178,12 @@ func TestDirFromModule_submodules(t *testing.T) {
{ {
Name: "Install", Name: "Install",
ModuleAddr: "child_a", ModuleAddr: "child_a",
LocalPath: filepath.Join(fromModuleDirRealpath, "child_a"), LocalPath: filepath.Join(fromModuleDir, "child_a"),
}, },
{ {
Name: "Install", Name: "Install",
ModuleAddr: "child_a.child_b", ModuleAddr: "child_a.child_b",
LocalPath: filepath.Join(fromModuleDirRealpath, "child_a/child_b"), LocalPath: filepath.Join(fromModuleDir, "child_a/child_b"),
}, },
} }
@@ -276,7 +273,13 @@ func TestDirFromModule_rel_submodules(t *testing.T) {
// - tmpdir/local-modules (with contents of testdata/local-modules) // - tmpdir/local-modules (with contents of testdata/local-modules)
// - tmpdir/empty: the workDir we CD into for the test // - tmpdir/empty: the workDir we CD into for the test
// - tmpdir/empty/target (target, the destination for init -from-module) // - tmpdir/empty/target (target, the destination for init -from-module)
tmpDir := t.TempDir() // EvalSymlinks is used here to expand short paths to full paths on Windows, e.g.:
// C:\RUNN~1\T... -> C:\runneradmin\T...
tmpDir, err := filepath.EvalSymlinks(t.TempDir())
if err != nil {
t.Fatalf("failed to expand short path: %v", err)
}
fromModuleDir := filepath.Join(tmpDir, "local-modules") fromModuleDir := filepath.Join(tmpDir, "local-modules")
workDir := filepath.Join(tmpDir, "empty") workDir := filepath.Join(tmpDir, "empty")
if err := os.Mkdir(fromModuleDir, os.ModePerm); err != nil { if err := os.Mkdir(fromModuleDir, os.ModePerm); err != nil {