fix test_access_policy_example

databroker/tests/conftest.py

@@ -114,22 +114,3 @@ def delete_dm():
 @pytest.fixture(params=['scalar', 'image', 'external_image'])
 def detector(request, hw):
     return getattr(hw, SIM_DETECTORS[request.param])
-
-
-@pytest.fixture
-def enter_password(monkeypatch):
-    """
-    Return a context manager that overrides getpass, used like:
-
-    >>> with enter_password(...):
-    ...     # Run code that calls getpass.getpass().
-    """
-
-    @contextlib.contextmanager
-    def f(password):
-        original = getpass.getpass
-        monkeypatch.setattr("getpass.getpass", lambda: password)
-        yield
-        monkeypatch.setattr("getpass.getpass", original)
-
-    return f

databroker/tests/test_access_policy.py

@@ -2,7 +2,7 @@
 from bluesky.plans import count
 from tiled.client import Context, from_context
 from tiled.server.app import build_app_from_config
-
+from tiled._tests.utils import enter_username_password
 from ..mongo_normalized import MongoAdapter, SimpleAccessPolicy
 
 
@@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs):
     InstrumentedMongoAdapter.from_mongomock(access_policy=access_policy)
 
 
-def test_access_policy_example(tmpdir, enter_password):
+def test_access_policy_example(tmpdir):
 
     config = {
         "authentication": {
@@ -52,8 +52,8 @@ def test_access_policy_example(tmpdir, enter_password):
         ],
     }
     with Context.from_app(build_app_from_config(config), token_cache=tmpdir) as context:
-        with enter_password("secret"):
-            client = from_context(context, username="alice", prompt_for_reauthentication=True)
+        with enter_username_password("alice", "secret"):
+            client = from_context(context, prompt_for_reauthentication=True)
 
         def post_document(name, doc):
             client.post_document(name, doc)