mirror of
https://github.com/opentffoundation/opentf.git
synced 2025-12-25 01:00:16 -05:00
Revert PRs that introduced propogating contexts (#835)
Co-authored-by: Dmitry Kisler <admin@dkisler.com>
This commit is contained in:
@@ -279,16 +279,14 @@ func TestMTLSServer_NoCertFails(t *testing.T) {
|
||||
t.Fatal("nil backend")
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
// Now get a state manager and check that it fails to refresh the state
|
||||
sm, err := b.StateMgr(ctx, backend.DefaultStateName)
|
||||
sm, err := b.StateMgr(backend.DefaultStateName)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error fetching StateMgr with %s: %v", backend.DefaultStateName, err)
|
||||
}
|
||||
|
||||
opErr := new(net.OpError)
|
||||
err = sm.RefreshState(ctx)
|
||||
err = sm.RefreshState()
|
||||
if err == nil {
|
||||
t.Fatal("expected error when refreshing state without a client cert")
|
||||
}
|
||||
@@ -352,14 +350,12 @@ func TestMTLSServer_WithCertPasses(t *testing.T) {
|
||||
t.Fatal("nil backend")
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
// Now get a state manager, fetch the state, and ensure that the "foo" output is not set
|
||||
sm, err := b.StateMgr(ctx, backend.DefaultStateName)
|
||||
sm, err := b.StateMgr(backend.DefaultStateName)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error fetching StateMgr with %s: %v", backend.DefaultStateName, err)
|
||||
}
|
||||
if err = sm.RefreshState(ctx); err != nil {
|
||||
if err = sm.RefreshState(); err != nil {
|
||||
t.Fatalf("unexpected error calling RefreshState: %v", err)
|
||||
}
|
||||
state := sm.State()
|
||||
@@ -400,10 +396,10 @@ func TestMTLSServer_WithCertPasses(t *testing.T) {
|
||||
if err = sm.WriteState(state); err != nil {
|
||||
t.Errorf("error writing state: %v", err)
|
||||
}
|
||||
if err = sm.PersistState(ctx, nil); err != nil {
|
||||
if err = sm.PersistState(nil); err != nil {
|
||||
t.Errorf("error persisting state: %v", err)
|
||||
}
|
||||
if err = sm.RefreshState(ctx); err != nil {
|
||||
if err = sm.RefreshState(); err != nil {
|
||||
t.Errorf("error refreshing state: %v", err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user