Merge branch 'main' of https://github.com/coder/coder into spike/9428…

…-pt2-integrate-acquirer
coder · spikecurtis · Sep 19, 2023 · Sep 8, 2023 · Sep 13, 2023 · Sep 13, 2023
commit 27162b7f58b1e3976521d268792609946fa771f3
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -59,7 +59,7 @@ func TestProvisionerd(t *testing.T) {
 			close(done)
 		})
 		closer := createProvisionerd(t, func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) {
-			return createProvisionerDaemonClient(ctx, t, done, provisionerDaemonTestServer{}), nil
+			return createProvisionerDaemonClient(t, done, provisionerDaemonTestServer{}), nil
 		}, provisionerd.LocalProvisioners{})
 		require.NoError(t, closer.Close())
 	})
@@ -1086,7 +1086,7 @@ func createProvisionerd(t *testing.T, dialer provisionerd.Dialer, connector prov
 
 // Creates a provisionerd protobuf client that's connected
 // to the server implementation provided.
-func createProvisionerDaemonClient(ctx context.Context, t *testing.T, done <-chan struct{}, server provisionerDaemonTestServer) proto.DRPCProvisionerDaemonClient {
+func createProvisionerDaemonClient(t *testing.T, done <-chan struct{}, server provisionerDaemonTestServer) proto.DRPCProvisionerDaemonClient {
 	t.Helper()
 	if server.failJob == nil {
 		// Default to asserting the error from the failure, otherwise
@@ -1105,7 +1105,7 @@ func createProvisionerDaemonClient(ctx context.Context, t *testing.T, done <-cha
 	err := proto.DRPCRegisterProvisionerDaemon(mux, &server)
 	require.NoError(t, err)
 	srv := drpcserver.New(mux)
-	ctx, cancelFunc := context.WithCancel(ctx)
+	ctx, cancelFunc := context.WithCancel(context.Background())
 	closed := make(chan struct{})
 	go func() {
 		defer close(closed)
@@ -1116,31 +1116,13 @@ func createProvisionerDaemonClient(ctx context.Context, t *testing.T, done <-cha
 		<-closed
 		select {
 		case <-done:
-			// It's possible to get unlucky since the dialer is run in a retry in a goroutine.
-			// The following can occur:
-			//   1. The provisionerd.connect goroutine checks if we're closed prior to attempting to establish a connection
-			//      with coderd, sees that we're not.
-			//   2. A test closes the server.
-			//   3. The provisionerd.connect goroutine calls the dialer to establish a connection. This
-			//      function detects that someone has tried to create a client after the test finishes.
-			if ctx.Err() == nil {
-				t.Error("createProvisionerDaemonClient cleanup after test was done!")
-			}
+			t.Error("createProvisionerDaemonClient cleanup after test was done!")
 		default:
 		}
 	})
 	select {
 	case <-done:
-		// It's possible to get unlucky since the dialer is run in a retry in a goroutine.
-		// The following can occur:
-		//   1. The provisionerd.connect goroutine checks if we're closed prior to attempting to establish a connection
-		//      with coderd, sees that we're not.
-		//   2. A test closes the server.
-		//   3. The provisionerd.connect goroutine calls the dialer to establish a connection. This
-		//      function detects that someone has tried to create a client after the test finishes.
-		if ctx.Err() == nil {
-			t.Error("createProvisionerDaemonClient cleanup after test was done!")
-		}
+		t.Error("called createProvisionerDaemonClient after test was done!")
 	default:
 	}
 	return proto.NewDRPCProvisionerDaemonClient(clientPipe)