no need to loop this test any longer

This commit is contained in:
James Bardin 2020-10-07 10:47:09 -04:00
parent 826ccdd123
commit 8d5e844158
1 changed files with 8 additions and 16 deletions

View File

@ -1593,7 +1593,6 @@ func TestContext2Apply_destroyModuleVarProviderConfig(t *testing.T) {
} }
} }
// https://github.com/hashicorp/terraform/issues/2892
func TestContext2Apply_destroyCrossProviders(t *testing.T) { func TestContext2Apply_destroyCrossProviders(t *testing.T) {
m := testModule(t, "apply-destroy-cross-providers") m := testModule(t, "apply-destroy-cross-providers")
@ -1629,23 +1628,16 @@ func TestContext2Apply_destroyCrossProviders(t *testing.T) {
addrs.NewDefaultProvider("aws"): testProviderFuncFixed(p_aws), addrs.NewDefaultProvider("aws"): testProviderFuncFixed(p_aws),
} }
// Bug only appears from time to time, ctx := getContextForApply_destroyCrossProviders(t, m, providers)
// so we run this test multiple times
// to check for the race-condition
// FIXME: this test flaps now, so run it more times if _, diags := ctx.Plan(); diags.HasErrors() {
for i := 0; i <= 100; i++ { logDiagnostics(t, diags)
ctx := getContextForApply_destroyCrossProviders(t, m, providers) t.Fatal("plan failed")
}
if _, diags := ctx.Plan(); diags.HasErrors() { if _, diags := ctx.Apply(); diags.HasErrors() {
logDiagnostics(t, diags) logDiagnostics(t, diags)
t.Fatal("plan failed") t.Fatal("apply failed")
}
if _, diags := ctx.Apply(); diags.HasErrors() {
logDiagnostics(t, diags)
t.Fatal("apply failed")
}
} }
} }