Skip to content

Commit ef2ccc5

Browse files
committed
Disable checkpoint.
We don't need to reach out to checkpoint when running tests, so disable that information. Fixes #640. Also remove our logging override, as we've updated to a version of go-plugin that doesn't require that anymore. See also #661.
1 parent 5b8edee commit ef2ccc5

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

helper/resource/plugin.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ func runProviderCommand(t testing.T, f func() error, wd *plugintest.WorkingDir,
3636
// plugins.
3737
os.Setenv("PLUGIN_PROTOCOL_VERSIONS", "5")
3838

39+
// Terraform doesn't need to reach out to Checkpoint during testing.
40+
wd.Setenv("CHECKPOINT_DISABLE", "1")
41+
3942
// Terraform 0.12.X and 0.13.X+ treat namespaceless providers
4043
// differently in terms of what namespace they default to. So we're
4144
// going to set both variations, as we don't know which version of
@@ -100,10 +103,6 @@ func runProviderCommand(t testing.T, f func() error, wd *plugintest.WorkingDir,
100103
},
101104
}
102105

103-
// plugin.DebugServe hijacks our log output location, so let's
104-
// reset it
105-
logging.SetOutput(t)
106-
107106
// when the provider exits, remove one from the waitgroup
108107
// so we can track when everything is done
109108
go func(c <-chan struct{}) {

0 commit comments

Comments
 (0)