55566bc797a24f9a445fc30245f103229f5d5deb,python/ray/util/client/ray_client_helpers.py,,ray_start_client_server,#,8

Before Change

    server = ray_client_server.serve("localhost:50051")
    ray.connect("localhost:50051")
    try:
        yield ray
    finally:
        ray._inside_client_test = False
        ray.disconnect()
        server.stop(0)

After Change

@contextmanager
def ray_start_client_server():
    with ray_start_client_server_pair() as pair:
        client, server = pair
        yield client


@contextmanager
def ray_start_client_server_pair():
    ray._inside_client_test = True
    server = ray_client_server.serve("localhost:50051")

Instances