Skip to content

Commit 98d8109

Browse files
committed
Drop logging override.
Missed a logging override in #663. This should fix the last of the race condition where logging can get written to stderr unexpectedly during tests. We no longer need to do this because go-plugin was fixed and we upgraded in #639. We don't want to overwrite that fix in tests.
1 parent 09deac3 commit 98d8109

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

helper/resource/plugin.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hashicorp/go-hclog"
1313
"github.com/hashicorp/terraform-exec/tfexec"
1414
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
15-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
1615
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1716
"github.com/hashicorp/terraform-plugin-sdk/v2/internal/plugintest"
1817
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
@@ -178,10 +177,6 @@ func runProviderCommand(t testing.T, f func() error, wd *plugintest.WorkingDir,
178177
},
179178
}
180179

181-
// plugin.DebugServe hijacks our log output location, so let's
182-
// reset it
183-
logging.SetOutput(t)
184-
185180
// when the provider exits, remove one from the waitgroup
186181
// so we can track when everything is done
187182
go func(c <-chan struct{}) {

0 commit comments

Comments
 (0)