Fix lints

posit-dev · Nov 8, 2024 · ca94ffd · ca94ffd
1 parent 8bf414d
commit ca94ffd
Show file tree

Hide file tree

Showing 14 changed files with 321 additions and 280 deletions.
diff --git a/tests/posit/connect/external/test_databricks.py b/tests/posit/connect/external/test_databricks.py
@@ -6,12 +6,13 @@
 from posit.connect import Client
 from posit.connect.external.databricks import (
     CredentialsProvider,
+    CredentialsStrategy,
     PositCredentialsProvider,
     PositCredentialsStrategy,
 )
 
 
-class mock_strategy:
+class mock_strategy(CredentialsStrategy):
     def auth_type(self) -> str:
         return "local"
 

diff --git a/tests/posit/connect/metrics/test_shiny_usage.py b/tests/posit/connect/metrics/test_shiny_usage.py
@@ -6,15 +6,19 @@
 
 from posit.connect.metrics import shiny_usage
 from posit.connect.resources import ResourceParameters
+from posit.connect.urls import Url
 
-from ..api import load_mock
+from ..api import load_mock, load_mock_dict
 
 
 class TestShinyUsageEventAttributes:
+    @classmethod
     def setup_class(cls):
+        results = load_mock_dict("v1/instrumentation/shiny/usage?limit=500.json")["results"]
+        assert isinstance(results, list)
         cls.event = shiny_usage.ShinyUsageEvent(
             mock.Mock(),
-            **load_mock("v1/instrumentation/shiny/usage?limit=500.json")["results"][0],
+            **results[0],
         )
 
     def test_content_guid(self):
@@ -37,34 +41,34 @@ class TestShinyUsageFind:
     @responses.activate
     def test(self):
         # behavior
-        mock_get = [None] * 2
-        mock_get[0] = responses.get(
-            "https://connect.example/__api__/v1/instrumentation/shiny/usage",
-            json=load_mock("v1/instrumentation/shiny/usage?limit=500.json"),
-            match=[
-                matchers.query_param_matcher(
-                    {
-                        "limit": 500,
-                    },
-                ),
-            ],
-        )
-
-        mock_get[1] = responses.get(
-            "https://connect.example/__api__/v1/instrumentation/shiny/usage",
-            json=load_mock("v1/instrumentation/shiny/usage?limit=500&next=23948901087.json"),
-            match=[
-                matchers.query_param_matcher(
-                    {
-                        "next": "23948901087",
-                        "limit": 500,
-                    },
-                ),
-            ],
-        )
+        mock_get = [
+            responses.get(
+                "https://connect.example/__api__/v1/instrumentation/shiny/usage",
+                json=load_mock("v1/instrumentation/shiny/usage?limit=500.json"),
+                match=[
+                    matchers.query_param_matcher(
+                        {
+                            "limit": 500,
+                        },
+                    ),
+                ],
+            ),
+            responses.get(
+                "https://connect.example/__api__/v1/instrumentation/shiny/usage",
+                json=load_mock("v1/instrumentation/shiny/usage?limit=500&next=23948901087.json"),
+                match=[
+                    matchers.query_param_matcher(
+                        {
+                            "next": "23948901087",
+                            "limit": 500,
+                        },
+                    ),
+                ],
+            ),
+        ]
 
         # setup
-        params = ResourceParameters(requests.Session(), "https://connect.example/__api__")
+        params = ResourceParameters(requests.Session(), Url("https://connect.example/__api__"))
 
         # invoke
         events = shiny_usage.ShinyUsage(params).find()
@@ -79,34 +83,34 @@ class TestShinyUsageFindOne:
     @responses.activate
     def test(self):
         # behavior
-        mock_get = [None] * 2
-        mock_get[0] = responses.get(
-            "https://connect.example/__api__/v1/instrumentation/shiny/usage",
-            json=load_mock("v1/instrumentation/shiny/usage?limit=500.json"),
-            match=[
-                matchers.query_param_matcher(
-                    {
-                        "limit": 500,
-                    },
-                ),
-            ],
-        )
-
-        mock_get[1] = responses.get(
-            "https://connect.example/__api__/v1/instrumentation/shiny/usage",
-            json=load_mock("v1/instrumentation/shiny/usage?limit=500&next=23948901087.json"),
-            match=[
-                matchers.query_param_matcher(
-                    {
-                        "next": "23948901087",
-                        "limit": 500,
-                    },
-                ),
-            ],
-        )
+        mock_get = [
+            responses.get(
+                "https://connect.example/__api__/v1/instrumentation/shiny/usage",
+                json=load_mock("v1/instrumentation/shiny/usage?limit=500.json"),
+                match=[
+                    matchers.query_param_matcher(
+                        {
+                            "limit": 500,
+                        },
+                    ),
+                ],
+            ),
+            responses.get(
+                "https://connect.example/__api__/v1/instrumentation/shiny/usage",
+                json=load_mock("v1/instrumentation/shiny/usage?limit=500&next=23948901087.json"),
+                match=[
+                    matchers.query_param_matcher(
+                        {
+                            "next": "23948901087",
+                            "limit": 500,
+                        },
+                    ),
+                ],
+            ),
+        ]
 
         # setup
-        params = ResourceParameters(requests.Session(), "https://connect.example/__api__")
+        params = ResourceParameters(requests.Session(), Url("https://connect.example/__api__"))
 
         # invoke
         event = shiny_usage.ShinyUsage(params).find_one()