CI fixes

martindurant · martindurant · commit 8218355dda35 · 2022-09-12T16:31:11.000-04:00
diff --git a/streamz/tests/py3_test_core.py b/streamz/tests/py3_test_core.py
@@ -1,16 +1,16 @@
 # flake8: noqa
+import asyncio
 from time import time
-from distributed.utils_test import loop, inc  # noqa
-from tornado import gen
+from distributed.utils_test import inc  # noqa
 
 from streamz import Stream
 
 
-def test_await_syntax(loop):  # noqa
+def test_await_syntax():  # noqa
     L = []
 
     async def write(x):
-        await gen.sleep(0.1)
+        await asyncio.sleep(0.1)
         L.append(x)
 
     async def f():
@@ -25,4 +25,4 @@ async def f():
         assert 0.2 < stop - start < 0.4
         assert 2 <= len(L) <= 4
 
-    loop.run_sync(f)
+    asyncio.run(f())
diff --git a/streamz/tests/test_core.py b/streamz/tests/test_core.py
@@ -1,3 +1,4 @@
+import asyncio
 from datetime import timedelta
 from functools import partial
 import itertools
@@ -12,14 +13,15 @@
 
 from tornado.queues import Queue
 from tornado.ioloop import IOLoop
+from tornado import gen
 
 import streamz as sz
 
 from streamz import RefCounter
 from streamz.sources import sink_to_file
 from streamz.utils_test import (inc, double, gen_test, tmpfile, captured_logger,   # noqa: F401
         clean, await_for, metadata, wait_for)  # noqa: F401
-from distributed.utils_test import loop   # noqa: F401
+from distributed.utils_test import loop, loop_in_thread, cleanup   # noqa: F401
 
 
 def test_basic():
@@ -1485,37 +1487,13 @@ def dont_test_stream_kwargs(clean):  # noqa: F811
     sin.emit(1)
 
 
-@pytest.fixture
-def thread(loop):  # noqa: F811
-    from threading import Thread, Event
-    thread = Thread(target=loop.start)
-    thread.daemon = True
-    thread.start()
-
-    event = Event()
-    loop.add_callback(event.set)
-    event.wait()
-
-    return thread
-
-
 def test_percolate_loop_information(clean):  # noqa: F811
     source = Stream()
     assert not source.loop
     s = source.timed_window(0.5)
     assert source.loop is s.loop
 
 
-def test_separate_thread_without_time(loop, thread):  # noqa: F811
-    assert thread.is_alive()
-    source = Stream(loop=loop)
-    L = source.map(inc).sink_to_list()
-
-    for i in range(10):
-        source.emit(i)
-        assert L[-1] == i + 1
-
-
 def test_separate_thread_with_time(clean):  # noqa: F811
     L = []
 
diff --git a/streamz/tests/test_dask.py b/streamz/tests/test_dask.py
@@ -13,9 +13,10 @@
 
 from distributed import Future, Client
 from distributed.utils import sync
-from distributed.utils_test import gen_cluster, inc, cluster, loop, slowinc  # noqa: F401
+from distributed.utils_test import gen_cluster, loop, loop_in_thread, cleanup, inc, cluster, loop, slowinc  # noqa: F401
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_map(c, s, a, b):
     source = Stream(asynchronous=True)
@@ -30,6 +31,7 @@ async def test_map(c, s, a, b):
     assert all(isinstance(f, Future) for f in futures_L)
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_map_on_dict(c, s, a, b):
     # dask treats dicts differently, so we have to make sure
@@ -52,6 +54,7 @@ def add_to_dict(d):
         assert item["i"] == i
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_partition_then_scatter_async(c, s, a, b):
     # Ensure partition w/ timeout before scatter works correctly for
@@ -92,6 +95,7 @@ def test_partition_then_scatter_sync(loop):
             assert L == [1, 2, 3]
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_non_unique_emit(c, s, a, b):
     """Regression for https://github.com/python-streamz/streams/issues/397
@@ -110,6 +114,7 @@ async def test_non_unique_emit(c, s, a, b):
     assert L[0] != L[1] or L[0] != L[2]
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_scan(c, s, a, b):
     source = Stream(asynchronous=True)
@@ -124,6 +129,7 @@ async def test_scan(c, s, a, b):
     assert all(isinstance(f, Future) for f in futures_L)
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_scan_state(c, s, a, b):
     source = Stream(asynchronous=True)
@@ -139,6 +145,7 @@ def f(acc, i):
     assert L == [0, 1, 3]
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_zip(c, s, a, b):
     a = Stream(asynchronous=True)
@@ -155,6 +162,7 @@ async def test_zip(c, s, a, b):
     assert L == [(1, 'a'), (2, 'b')]
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_accumulate(c, s, a, b):
     source = Stream(asynchronous=True)
@@ -192,6 +200,7 @@ def test_sync_2(loop):  # noqa: F811
             assert L == list(map(inc, range(10)))
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True, nthreads=[('127.0.0.1', 1)] * 2)
 async def test_buffer(c, s, a, b):
     source = Stream(asynchronous=True)
@@ -241,6 +250,7 @@ def test_buffer_sync(loop):  # noqa: F811
             assert L == list(map(inc, range(10)))
 
 
+@pytest.mark.asyncio
 @pytest.mark.xfail(reason='')
 async def test_stream_shares_client_loop(loop):  # noqa: F811
     with cluster() as (s, [a, b]):
@@ -250,6 +260,7 @@ async def test_stream_shares_client_loop(loop):  # noqa: F811
             assert source.loop is client.loop
 
 
+@pytest.mark.asyncio
 @gen_cluster(client=True)
 async def test_starmap(c, s, a, b):
     def add(x, y, z=0):
