Merge pull request #3014 from VWS-Python/pytest-fixture-keyword-only-args

Use * for keyword-only arguments in pytest fixtures

Author: adamtheturtle

tests/conftest.py

@@ -22,7 +22,7 @@
 
 
 @pytest.fixture(name="vws_client")
-def fixture_vws_client(vuforia_database: CloudDatabase) -> VWS:
+def fixture_vws_client(*, vuforia_database: CloudDatabase) -> VWS:
     """A VWS client for an active VWS database."""
     return VWS(
         server_access_key=vuforia_database.server_access_key,
@@ -31,7 +31,7 @@ def fixture_vws_client(vuforia_database: CloudDatabase) -> VWS:
 
 
 @pytest.fixture
-def cloud_reco_client(vuforia_database: CloudDatabase) -> CloudRecoService:
+def cloud_reco_client(*, vuforia_database: CloudDatabase) -> CloudRecoService:
     """A query client for an active VWS database."""
     return CloudRecoService(
         client_access_key=vuforia_database.client_access_key,
@@ -40,7 +40,10 @@ def cloud_reco_client(vuforia_database: CloudDatabase) -> CloudRecoService:
 
 
 @pytest.fixture(name="inactive_vws_client")
-def fixture_inactive_vws_client(inactive_cloud_database: CloudDatabase) -> VWS:
+def fixture_inactive_vws_client(
+    *,
+    inactive_cloud_database: CloudDatabase,
+) -> VWS:
     """A client for an inactive VWS database."""
     return VWS(
         server_access_key=inactive_cloud_database.server_access_key,
@@ -50,6 +53,7 @@ def fixture_inactive_vws_client(inactive_cloud_database: CloudDatabase) -> VWS:
 
 @pytest.fixture
 def inactive_cloud_reco_client(
+    *,
     inactive_cloud_database: CloudDatabase,
 ) -> CloudRecoService:
     """A query client for an inactive VWS database."""
@@ -61,6 +65,7 @@ def inactive_cloud_reco_client(
 
 @pytest.fixture
 def target_id(
+    *,
     image_file_success_state_low_rating: io.BytesIO,
     vws_client: VWS,
 ) -> str:
@@ -91,7 +96,7 @@ def target_id(
         "vumark_generate_instance",
     ],
 )
-def endpoint(request: pytest.FixtureRequest) -> Endpoint:
+def endpoint(*, request: pytest.FixtureRequest) -> Endpoint:
     """
     Return details of an endpoint for the Target API or the Query
     API.
@@ -120,7 +125,7 @@ def endpoint(request: pytest.FixtureRequest) -> Endpoint:
         ),
     ],
 )
-def not_base64_encoded_processable(request: pytest.FixtureRequest) -> str:
+def not_base64_encoded_processable(*, request: pytest.FixtureRequest) -> str:
     """Return a string which is not decodable as base64 data, but Vuforia
     will
     respond as if this is valid base64 data.
@@ -144,7 +149,10 @@ def not_base64_encoded_processable(request: pytest.FixtureRequest) -> str:
         pytest.param('"', id="Not a base64 character."),
     ],
 )
-def not_base64_encoded_not_processable(request: pytest.FixtureRequest) -> str:
+def not_base64_encoded_not_processable(
+    *,
+    request: pytest.FixtureRequest,
+) -> str:
     """
     Return a string which is not decodable as base64 data, and Vuforia
     will

tests/mock_vws/fixtures/prepared_requests.py

@@ -39,6 +39,7 @@ def _wait_for_target_processed(*, vws_client: VWS, target_id: str) -> None:
 
 @pytest.fixture
 def add_target(
+    *,
     vuforia_database: CloudDatabase,
     image_file_failed_state: io.BytesIO,
 ) -> Endpoint:
@@ -93,6 +94,7 @@ def add_target(
 
 @pytest.fixture
 def delete_target(
+    *,
     vuforia_database: CloudDatabase,
     target_id: str,
     vws_client: VWS,
@@ -136,7 +138,7 @@ def delete_target(
 
 
 @pytest.fixture
-def database_summary(vuforia_database: CloudDatabase) -> Endpoint:
+def database_summary(*, vuforia_database: CloudDatabase) -> Endpoint:
     """
     Return details of the endpoint for getting details about the
     database.
@@ -180,6 +182,7 @@ def database_summary(vuforia_database: CloudDatabase) -> Endpoint:
 
 @pytest.fixture
 def get_duplicates(
+    *,
     vuforia_database: CloudDatabase,
     target_id: str,
     vws_client: VWS,
@@ -228,6 +231,7 @@ def get_duplicates(
 
 @pytest.fixture
 def get_target(
+    *,
     vuforia_database: CloudDatabase,
     target_id: str,
     vws_client: VWS,
@@ -272,7 +276,7 @@ def get_target(
 
 
 @pytest.fixture
-def target_list(vuforia_database: CloudDatabase) -> Endpoint:
+def target_list(*, vuforia_database: CloudDatabase) -> Endpoint:
     """Return details of the endpoint for getting a list of targets."""
     date = rfc_1123_date()
     request_path = "/targets"
@@ -313,6 +317,7 @@ def target_list(vuforia_database: CloudDatabase) -> Endpoint:
 
 @pytest.fixture
 def target_summary(
+    *,
     vuforia_database: CloudDatabase,
     target_id: str,
     vws_client: VWS,
@@ -361,6 +366,7 @@ def target_summary(
 
 @pytest.fixture
 def update_target(
+    *,
     vuforia_database: CloudDatabase,
     target_id: str,
     vws_client: VWS,
@@ -409,6 +415,7 @@ def update_target(
 
 @pytest.fixture
 def query(
+    *,
     vuforia_database: CloudDatabase,
     high_quality_image: io.BytesIO,
 ) -> Endpoint:
@@ -459,6 +466,7 @@ def query(
 
 @pytest.fixture
 def vumark_generate_instance(
+    *,
     vumark_vuforia_database: VuMarkCloudDatabase,
 ) -> Endpoint:
     """Return details of the endpoint for generating a VuMark instance."""

tests/mock_vws/test_flask_app_usage.py

@@ -33,7 +33,7 @@
 
 
 @pytest.fixture(autouse=True)
-def _(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
+def _(*, monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
     """Enable a mock service backed by the Flask applications."""
     with responses.RequestsMock(
         assert_all_requests_are_fired=False,