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

command: tests should not leave dirs behind thank you (#24340)

This commit is contained in:
Kristin Laemmert 2020-03-10 16:32:22 -04:00 committed by GitHub
parent c7cc0afb80
commit 5901952882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
command/init_test.go
View File

@ -50,6 +50,12 @@ func TestInit_empty(t *testing.T) {
} }
func TestInit_multipleArgs(t *testing.T) { func TestInit_multipleArgs(t *testing.T) {
// Create a temporary working directory that is empty
td := tempDir(t)
os.MkdirAll(td, 0755)
defer os.RemoveAll(td)
defer testChdir(t, td)()
ui := new(cli.MockUi) ui := new(cli.MockUi)
c := &InitCommand{ c := &InitCommand{
Meta: Meta{ Meta: Meta{
@ -68,11 +74,10 @@ func TestInit_multipleArgs(t *testing.T) {
} }
func TestInit_fromModule_explicitDest(t *testing.T) { func TestInit_fromModule_explicitDest(t *testing.T) {
dir := tempDir(t) td := tempDir(t)
err := os.Mkdir(dir, os.ModePerm) os.MkdirAll(td, 0755)
if err != nil { defer os.RemoveAll(td)
t.Fatal(err) defer testChdir(t, td)()
}
ui := new(cli.MockUi) ui := new(cli.MockUi)
c := &InitCommand{ c := &InitCommand{
@ -93,13 +98,13 @@ func TestInit_fromModule_explicitDest(t *testing.T) {
args := []string{ args := []string{
"-from-module=" + testFixturePath("init"), "-from-module=" + testFixturePath("init"),
dir, td,
} }
if code := c.Run(args); code != 0 { if code := c.Run(args); code != 0 {
t.Fatalf("bad: \n%s", ui.ErrorWriter.String()) t.Fatalf("bad: \n%s", ui.ErrorWriter.String())
} }
if _, err := os.Stat(filepath.Join(dir, "hello.tf")); err != nil { if _, err := os.Stat(filepath.Join(td, "hello.tf")); err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
} }
@ -137,6 +142,7 @@ func TestInit_fromModule_dstInSrc(t *testing.T) {
if err := os.MkdirAll(dir, 0755); err != nil { if err := os.MkdirAll(dir, 0755); err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }
defer os.RemoveAll(dir)
// Change to the temporary directory // Change to the temporary directory
cwd, err := os.Getwd() cwd, err := os.Getwd()
@ -208,7 +214,6 @@ func TestInit_getUpgradeModules(t *testing.T) {
// Create a temporary working directory that is empty // Create a temporary working directory that is empty
td := tempDir(t) td := tempDir(t)
os.MkdirAll(td, 0755) os.MkdirAll(td, 0755)
// copy.CopyDir(testFixturePath("init-get"), td)
defer os.RemoveAll(td) defer os.RemoveAll(td)
defer testChdir(t, td)() defer testChdir(t, td)()