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

tofu: Make a few tests more robust against panicking

Browse Source 
Some of our test cases expect that planning will fail but will still return
a non-nil plan with Errored set to true, and some other cases were not
expecting plan to fail at all, and in all of those cases a failure to meet
that expectation caused a panic rather than a test failure.

When debugging a problem that affects many tests it's annoying when the
test run panics partway through, so these small changes make these tests
a little more resilient to the system not behaving in the way they were
expecting, without affecting the behavior when the system behaves as
expected.

Signed-off-by: Martin Atkins <mart@degeneration.co.uk>
This commit is contained in:
Martin Atkins
2025-05-23 15:46:16 -07:00
parent ea620a9173
commit 9d8cc073b8
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/tofu/context_apply2_test.go
View File

@@ -2395,12 +2395,12 @@ locals {
plan, diags := ctx.Plan(context.Background(), m, states.NewState(), nil)
if diags.HasErrors() {
t.Errorf("expected no errors, but got %s", diags)
t.Fatalf("expected no errors, but got %s", diags)
}
state, diags := ctx.Apply(context.Background(), plan, m)
if diags.HasErrors() {
t.Errorf("expected no errors, but got %s", diags)
t.Fatalf("expected no errors, but got %s", diags)
}
// We didn't specify any external references, so the unreferenced local
@@ -2438,12 +2438,12 @@ locals {
},
})
if diags.HasErrors() {
t.Errorf("expected no errors, but got %s", diags)
t.Fatalf("expected no errors, but got %s", diags)
}
state, diags := ctx.Apply(context.Background(), plan, m)
if diags.HasErrors() {
t.Errorf("expected no errors, but got %s", diags)
t.Fatalf("expected no errors, but got %s", diags)
}
// We did specify the local value in the external references, so it should

13
internal/tofu/context_plan2_test.go
View File

@@ -4218,6 +4218,9 @@ func TestContext2Plan_preconditionErrors(t *testing.T) {
t.Fatal("succeeded; want errors")
}
if plan == nil {
t.Fatal("result from plan is nil; expected a plan marked as errored")
}
if !plan.Errored {
t.Fatal("plan failed to record error")
}
@@ -4903,6 +4906,9 @@ func TestContext2Plan_dataSourceReadPlanError(t *testing.T) {
if !diags.HasErrors() {
t.Fatalf("expected plan error")
}
if plan == nil {
t.Fatal("plan returned nil result; expected a non-nil plan marked as errored")
}
// make sure we can serialize the plan even if there were an error
_, _, _, err := contextOptsForPlanViaFile(t, snap, plan)
@@ -7422,6 +7428,9 @@ import {
t.Fatal("expected error")
}
if plan == nil {
t.Fatal("plan returned nil result; expected a plan marked as errored")
}
instPlan := plan.Changes.ResourceInstance(addr)
if instPlan == nil {
t.Fatalf("no plan for %s at all", addr)
@@ -7560,6 +7569,10 @@ locals {
t.Errorf("expected no resources in the state but found %d", len(module.LocalValues))
}
if plan == nil {
t.Fatal("plan returned nil result; expected a non-nil plan marked as errored")
}
// But, this makes it hard for the testing framework to valid things about
// the returned plan. So, the plan contains the planned state:
module = plan.PlannedState.RootModule()