Skip to content

Commit

Permalink
Drop logging override.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
paddycarver committed Dec 18, 2020
1 parent 09deac3 commit 3e832fc
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions helper/resource/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/terraform-exec/tfexec"
"github.com/hashicorp/terraform-plugin-go/tfprotov5"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/internal/plugintest"
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
Expand Down Expand Up @@ -178,10 +177,6 @@ func runProviderCommand(t testing.T, f func() error, wd *plugintest.WorkingDir,
},
}

// plugin.DebugServe hijacks our log output location, so let's
// reset it
logging.SetOutput(t)

// when the provider exits, remove one from the waitgroup
// so we can track when everything is done
go func(c <-chan struct{}) {
Expand Down

0 comments on commit 3e832fc

Please sign in to comment.