Skip to content

Commit

Permalink
Append all routes
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtomlinson committed May 23, 2022
1 parent edccb12 commit 5f38479
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions distributed/http/scheduler/tests/test_scheduler_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from distributed.utils import is_valid_xml
from distributed.utils_test import gen_cluster, inc, slowinc

DEFAULT_ROUTES = dask.config.get("distributed.scheduler.http.routes")


@gen_cluster(client=True)
async def test_connect(c, s, a, b):
Expand Down Expand Up @@ -258,7 +260,10 @@ def test_api_disabled_by_default():
@gen_cluster(
client=True,
clean_kwargs={"threads": False},
config={"distributed.scheduler.http.routes": ["distributed.http.scheduler.api"]},
config={
"distributed.scheduler.http.routes": DEFAULT_ROUTES
+ ["distributed.http.scheduler.api"]
},
)
async def test_api(c, s, a, b):
async with aiohttp.ClientSession() as session:
Expand All @@ -273,7 +278,10 @@ async def test_api(c, s, a, b):
@gen_cluster(
client=True,
clean_kwargs={"threads": False},
config={"distributed.scheduler.http.routes": ["distributed.http.scheduler.api"]},
config={
"distributed.scheduler.http.routes": DEFAULT_ROUTES
+ ["distributed.http.scheduler.api"]
},
)
async def test_retire_workers(c, s, a, b):
async with aiohttp.ClientSession() as session:
Expand All @@ -291,7 +299,10 @@ async def test_retire_workers(c, s, a, b):
@gen_cluster(
client=True,
clean_kwargs={"threads": False},
config={"distributed.scheduler.http.routes": ["distributed.http.scheduler.api"]},
config={
"distributed.scheduler.http.routes": DEFAULT_ROUTES
+ ["distributed.http.scheduler.api"]
},
)
async def test_get_workers(c, s, a, b):
async with aiohttp.ClientSession() as session:
Expand All @@ -308,7 +319,10 @@ async def test_get_workers(c, s, a, b):
@gen_cluster(
client=True,
clean_kwargs={"threads": False},
config={"distributed.scheduler.http.routes": ["distributed.http.scheduler.api"]},
config={
"distributed.scheduler.http.routes": DEFAULT_ROUTES
+ ["distributed.http.scheduler.api"]
},
)
async def test_adaptive_target(c, s, a, b):
async with aiohttp.ClientSession() as session:
Expand Down

0 comments on commit 5f38479

Please sign in to comment.