Revert PRs that introduced propogating contexts (#835)

Co-authored-by: Dmitry Kisler <admin@dkisler.com>
This commit is contained in:
James Humphries
2023-11-08 21:09:14 +00:00
committed by GitHub
parent 2d6dd8eda8
commit 9c24b6183a
124 changed files with 1131 additions and 1535 deletions

View File

@@ -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)
}