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

core: Fix testContext2Apply_destroyDependsOn, and similar 

These tests were relying on the full InstanceInfo we used to give to
providers, but the new API doesn't do that and so we will instead lean on
the ID from the state to recognize the apply ordering.
This commit is contained in:
Martin Atkins 2018-09-18 11:34:19 -07:00
parent 6bbedeb88b
commit 42febd5d14
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
terraform/context_apply_test.go
View File

@ -1283,10 +1283,10 @@ func testContext2Apply_destroyDependsOn(t *testing.T) {
var actual []string var actual []string
var actualLock sync.Mutex var actualLock sync.Mutex
p.ApplyFn = func( p.ApplyFn = func(
info *InstanceInfo, _ *InstanceState, _ *InstanceDiff) (*InstanceState, error) { _ *InstanceInfo, is *InstanceState, _ *InstanceDiff) (*InstanceState, error) {
actualLock.Lock() actualLock.Lock()
defer actualLock.Unlock() defer actualLock.Unlock()
actual = append(actual, info.Id) actual = append(actual, is.ID)
return nil, nil return nil, nil
} }
@ -1310,9 +1310,9 @@ func testContext2Apply_destroyDependsOn(t *testing.T) {
t.Fatalf("apply errors: %s", diags.Err()) t.Fatalf("apply errors: %s", diags.Err())
} }
expected := []string{"aws_instance.foo", "aws_instance.bar"} expected := []string{"foo", "bar"}
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual) t.Fatalf("wrong order\ngot: %#v\nwant: %#v", actual, expected)
} }
} }
@ -1363,10 +1363,10 @@ func testContext2Apply_destroyDependsOnStateOnly(t *testing.T) {
var actual []string var actual []string
var actualLock sync.Mutex var actualLock sync.Mutex
p.ApplyFn = func( p.ApplyFn = func(
info *InstanceInfo, _ *InstanceState, _ *InstanceDiff) (*InstanceState, error) { _ *InstanceInfo, is *InstanceState, _ *InstanceDiff) (*InstanceState, error) {
actualLock.Lock() actualLock.Lock()
defer actualLock.Unlock() defer actualLock.Unlock()
actual = append(actual, info.Id) actual = append(actual, is.ID)
return nil, nil return nil, nil
} }
@ -1390,9 +1390,9 @@ func testContext2Apply_destroyDependsOnStateOnly(t *testing.T) {
t.Fatalf("apply errors: %s", diags.Err()) t.Fatalf("apply errors: %s", diags.Err())
} }
expected := []string{"aws_instance.bar", "aws_instance.foo"} expected := []string{"bar", "foo"}
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual) t.Fatalf("wrong order\ngot: %#v\nwant: %#v", actual, expected)
} }
} }
@ -1443,10 +1443,10 @@ func testContext2Apply_destroyDependsOnStateOnlyModule(t *testing.T) {
var actual []string var actual []string
var actualLock sync.Mutex var actualLock sync.Mutex
p.ApplyFn = func( p.ApplyFn = func(
info *InstanceInfo, _ *InstanceState, _ *InstanceDiff) (*InstanceState, error) { _ *InstanceInfo, is *InstanceState, _ *InstanceDiff) (*InstanceState, error) {
actualLock.Lock() actualLock.Lock()
defer actualLock.Unlock() defer actualLock.Unlock()
actual = append(actual, info.Id) actual = append(actual, is.ID)
return nil, nil return nil, nil
} }
@ -1470,9 +1470,9 @@ func testContext2Apply_destroyDependsOnStateOnlyModule(t *testing.T) {
t.Fatalf("apply errors: %s", diags.Err()) t.Fatalf("apply errors: %s", diags.Err())
} }
expected := []string{"aws_instance.bar", "aws_instance.foo"} expected := []string{"bar", "foo"}
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual) t.Fatalf("wrong order\ngot: %#v\nwant: %#v", actual, expected)
} }
} }