|
23 | 23 |
|
24 | 24 |
|
25 | 25 | @pytest.mark.asyncio |
26 | | -@pytest.mark.timeout(2) |
27 | 26 | async def test_ioc(p4p_subprocess: tuple[str, Queue]): |
28 | 27 | pv_prefix, _ = p4p_subprocess |
29 | 28 | ctxt = Context("pva") |
@@ -75,7 +74,6 @@ async def test_ioc(p4p_subprocess: tuple[str, Queue]): |
75 | 74 |
|
76 | 75 |
|
77 | 76 | @pytest.mark.asyncio |
78 | | -@pytest.mark.timeout(5) |
79 | 77 | async def test_scan_method(p4p_subprocess: tuple[str, Queue]): |
80 | 78 | pv_prefix, _ = p4p_subprocess |
81 | 79 | ctxt = Context("pva") |
@@ -115,7 +113,6 @@ async def test_scan_method(p4p_subprocess: tuple[str, Queue]): |
115 | 113 |
|
116 | 114 |
|
117 | 115 | @pytest.mark.asyncio |
118 | | -@pytest.mark.timeout(2) |
119 | 116 | async def test_command_method(p4p_subprocess: tuple[str, Queue]): |
120 | 117 | pv_prefix, _ = p4p_subprocess |
121 | 118 | d_values = asyncio.Queue() |
@@ -177,7 +174,6 @@ async def test_command_method(p4p_subprocess: tuple[str, Queue]): |
177 | 174 |
|
178 | 175 |
|
179 | 176 | @pytest.mark.asyncio |
180 | | -@pytest.mark.timeout(2) |
181 | 177 | async def test_numeric_alarms(p4p_subprocess: tuple[str, Queue]): |
182 | 178 | pv_prefix, _ = p4p_subprocess |
183 | 179 | a_values = asyncio.Queue() |
@@ -528,7 +524,6 @@ async def _wait_and_put_pvs(): |
528 | 524 | ) |
529 | 525 |
|
530 | 526 |
|
531 | | -@pytest.mark.timeout(4) |
532 | 527 | def test_command_method_put_twice(caplog): |
533 | 528 | class SomeController(Controller): |
534 | 529 | command_runs_for_a_while_times = [] |
@@ -579,10 +574,7 @@ async def put_pvs(): |
579 | 574 | serve = asyncio.ensure_future(fastcs.serve(interactive=False)) |
580 | 575 | try: |
581 | 576 | asyncio.get_event_loop().run_until_complete( |
582 | | - asyncio.wait_for( |
583 | | - asyncio.gather(serve, put_pvs()), |
584 | | - timeout=3, |
585 | | - ) |
| 577 | + asyncio.wait_for(asyncio.gather(serve, put_pvs()), timeout=1) |
586 | 578 | ) |
587 | 579 | except TimeoutError: |
588 | 580 | ... |
|
0 commit comments