Skip to content

Commit

Permalink
remove Require versions of test funcs
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmoe
kmoe committed Sep 30, 2020
1 parent 12544ef commit b62e0bd
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 168 deletions.
50 changes: 36 additions & 14 deletions helper/resource/testing_new.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ func runPostTestDestroy(t testing.T, c TestCase, wd *plugintest.WorkingDir, fact
t.Helper()

err := runProviderCommand(t, func() error {
wd.RequireDestroy(t)
return nil
return wd.Destroy()
}, wd, factories)
if err != nil {
return err
Expand All @@ -44,8 +43,12 @@ func runNewTest(t testing.T, c TestCase, helper *plugintest.Helper) {

defer func() {
var statePreDestroy *terraform.State
err := runProviderCommand(t, func() error {
statePreDestroy = getState(t, wd)
var err error
err = runProviderCommand(t, func() error {
statePreDestroy, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand All @@ -68,10 +71,12 @@ func runNewTest(t testing.T, c TestCase, helper *plugintest.Helper) {
t.Fatal(err)
}

wd.RequireSetConfig(t, providerCfg)
err = wd.SetConfig(providerCfg)
if err != nil {
t.Fatalf("Error setting test config: %s", err)
}
err = runProviderCommand(t, func() error {
wd.RequireInit(t)
return nil
return wd.Init()
}, wd, c.ProviderFactories)
if err != nil {
t.Fatalf("Error running init: %s", err.Error())
Expand Down Expand Up @@ -137,15 +142,18 @@ func runNewTest(t testing.T, c TestCase, helper *plugintest.Helper) {
}
}

func getState(t testing.T, wd *plugintest.WorkingDir) *terraform.State {
func getState(t testing.T, wd *plugintest.WorkingDir) (*terraform.State, error) {
t.Helper()

jsonState := wd.RequireState(t)
jsonState, err := wd.State()
if err != nil {
return nil, err
}
state, err := shimStateFromJson(jsonState)
if err != nil {
t.Fatal(err)
}
return state
return state, nil
}

func stateIsEmpty(state *terraform.State) bool {
Expand Down Expand Up @@ -187,13 +195,27 @@ func testIDRefresh(c TestCase, t testing.T, wd *plugintest.WorkingDir, step Test
if err != nil {
return err
}
wd.RequireSetConfig(t, cfg)
defer wd.RequireSetConfig(t, step.Config)
err = wd.SetConfig(cfg)
if err != nil {
t.Fatalf("Error setting import test config: %s", err)
}
defer func() {
err = wd.SetConfig(step.Config)
if err != nil {
t.Fatalf("Error resetting test config: %s", err)
}
}()

// Refresh!
err = runProviderCommand(t, func() error {
wd.RequireRefresh(t)
state = getState(t, wd)
err = wd.Refresh()
if err != nil {
t.Fatalf("Error running terraform refresh: %s", err)
}
state, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand Down
23 changes: 18 additions & 5 deletions helper/resource/testing_new_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step

if !step.Destroy {
var state *terraform.State
err := runProviderCommand(t, func() error {
state = getState(t, wd)
var err error
err = runProviderCommand(t, func() error {
state, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand Down Expand Up @@ -64,7 +68,10 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step
// check function
var stateBeforeApplication *terraform.State
err = runProviderCommand(t, func() error {
stateBeforeApplication = getState(t, wd)
stateBeforeApplication, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand All @@ -85,7 +92,10 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step
// Get the new state
var state *terraform.State
err = runProviderCommand(t, func() error {
state = getState(t, wd)
state, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand Down Expand Up @@ -194,7 +204,10 @@ func testStepNewConfig(t testing.T, c TestCase, wd *plugintest.WorkingDir, step
// empty, find the first resource and test it.
var state *terraform.State
err = runProviderCommand(t, func() error {
state = getState(t, wd)
state, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand Down
21 changes: 15 additions & 6 deletions helper/resource/testing_new_import_state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ func testStepNewImportState(t testing.T, c TestCase, helper *plugintest.Helper,

// get state from check sequence
var state *terraform.State
err := runProviderCommand(t, func() error {
state = getState(t, wd)
var err error
err = runProviderCommand(t, func() error {
state, err = getState(t, wd)
if err != nil {
return err
}
return nil
}, wd, c.ProviderFactories)
if err != nil {
Expand Down Expand Up @@ -60,11 +64,13 @@ func testStepNewImportState(t testing.T, c TestCase, helper *plugintest.Helper,
}
importWd := helper.RequireNewWorkingDir(t)
defer importWd.Close()
importWd.RequireSetConfig(t, step.Config)
err = importWd.SetConfig(step.Config)
if err != nil {
t.Fatalf("Error setting test config: %s", err)
}

err = runProviderCommand(t, func() error {
importWd.RequireInit(t)
return nil
return importWd.Init()
}, importWd, c.ProviderFactories)
if err != nil {
t.Fatalf("Error running init: %s", err)
Expand All @@ -79,7 +85,10 @@ func testStepNewImportState(t testing.T, c TestCase, helper *plugintest.Helper,

var importState *terraform.State
err = runProviderCommand(t, func() error {
importState = getState(t, importWd)
importState, err = getState(t, importWd)
if err != nil {
return err
}
return nil
}, importWd, c.ProviderFactories)
if err != nil {
Expand Down
Loading

0 comments on commit b62e0bd

Please sign in to comment.