Merge remote-tracking branch 'origin/master' into query-2

Author: adamtheturtle

tests/conftest.py

@@ -17,6 +17,9 @@
 
 @pytest.fixture()
 def _mock_database() -> Iterator[VuforiaDatabase]:
+    """
+    Yield a mock ``VuforiaDatabase``.
+    """
     with MockVWS() as mock:
         database = VuforiaDatabase()
         mock.add_database(database=database)
@@ -28,22 +31,18 @@ def vws_client(_mock_database: VuforiaDatabase) -> Iterator[VWS]:
     """
     Yield a VWS client which connects to a mock.
     """
-    vws_client = VWS(
+    yield VWS(
         server_access_key=_mock_database.server_access_key,
         server_secret_key=_mock_database.server_secret_key,
     )
 
-    yield vws_client
-
 
 @pytest.fixture()
 def cloud_reco_client(_mock_database: VuforiaDatabase) -> Iterator[VWS]:
     """
     TODO Docstring
     """
-    client = CloudRecoService(
+    yield CloudRecoService(
         client_access_key=_mock_database.client_access_key,
         client_secret_key=_mock_database.client_secret_key,
     )
-
-    yield client