Merge branch 'master' into benc-k8s-kind-ci

Parsl · Nov 1, 2024 · fd26ddd · fd26ddd
2 parents 535289f + 4f20b3e
commit fd26ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/parsl/monitoring/radios.py b/parsl/monitoring/radios.py
@@ -5,15 +5,11 @@
 import uuid
 from abc import ABCMeta, abstractmethod
 from multiprocessing.queues import Queue
-from typing import Optional
 
 import zmq
 
 from parsl.serialize import serialize
 
-_db_manager_excepts: Optional[Exception]
-
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/parsl/tests/conftest.py b/parsl/tests/conftest.py
@@ -163,6 +163,10 @@ def pytest_configure(config):
         'markers',
         'executor_supports_std_stream_tuples: Marks tests that require tuple support for stdout/stderr'
     )
+    config.addinivalue_line(
+        'markers',
+        'shared_fs: Marks tests that require a shared_fs between the workers are the test client'
+    )
 
 
 @pytest.fixture(autouse=True, scope='session')