add integration tests; run make fmt

Author: toph-allen

rsconnect/api.py

@@ -219,13 +219,12 @@ def system_caches_runtime_list(self):
         response = self.get("v1/system/caches/runtime")
         self._server.handle_bad_response(response)
         return response
-    
+
     def system_caches_runtime_delete(self, target):
         response = self.delete("v1/system/caches/runtime", body=target)
         self._server.handle_bad_response(response)
         return response
 
-
     def task_get(self, task_id, first_status=None):
         params = None
         if first_status is not None:
@@ -994,25 +993,22 @@ def make_deployment_name(self, title, force_unique):
 
     def list_runtime_caches(self):
         return self.client.system_caches_runtime_list()
-    
+
     def delete_runtime_cache(self, language, version, image_name, dry_run):
-        target = {
-            "language": language,
-            "version": version,
-            "image_name": image_name,
-            "dry_run": dry_run
-        }
+        target = {"language": language, "version": version, "image_name": image_name, "dry_run": dry_run}
         result = self.client.system_caches_runtime_delete(target)
         if result["task_id"] == None:
-            print(f"Would delete cache: '{result['language']}', version: '{result['version']}', image_name: '{result['image_name']}'")
+            print(
+                f"Would delete cache: '{result['language']}', version: '{result['version']}', image_name: '{result['image_name']}'"
+            )
             print("Dry run finished")
             return result
         else:
-            print(f"Deleting cache: '{result['language']}', version: '{result['version']}', image_name: '{result['image_name']}', task_id: '{result['task_id']}'")
+            print(
+                f"Deleting cache: '{result['language']}', version: '{result['version']}', image_name: '{result['image_name']}', task_id: '{result['task_id']}'"
+            )
             (log_lines, task_status) = self.client.wait_for_task(
-                result["task_id"],
-                connect_logger.info,
-                raise_on_error=False
+                result["task_id"], connect_logger.info, raise_on_error=False
             )
 
             # Task status cannot be finished because we have no timeout.
@@ -1026,7 +1022,6 @@ def delete_runtime_cache(self, language, version, image_name, dry_run):
             return task_status
 
 
-
 def filter_out_server_info(**kwargs):
     server_fields = {"connect_server", "name", "server", "api_key", "insecure", "cacert"}
     new_kwargs = {k: v for k, v in kwargs.items() if k not in server_fields}

rsconnect/http_support.py

@@ -243,7 +243,6 @@ def put(self, path, query_params=None, body=None, headers=None, decode_response=
     def delete(self, path, query_params=None, body=None, decode_response=True):
         return self.request("DELETE", path, query_params, body, decode_response=decode_response)
 
-
     def request(
         self,
         method,

rsconnect/main.py

@@ -2421,6 +2421,7 @@ def start_content_build(
 def system():
     pass
 
+
 @system.group(no_args_is_help=True, help="Interact with Posit Connect's system caches.")
 def caches():
     pass
@@ -2466,6 +2467,7 @@ def system_caches_list(name, server, api_key, insecure, cacert, verbose):
         result = ce.list_runtime_caches()
         json.dump(result, sys.stdout, indent=2)
 
+
 # noinspection SpellCheckingInspection,DuplicatedCode
 @caches.command(
     name="delete",
@@ -2511,7 +2513,7 @@ def system_caches_list(name, server, api_key, insecure, cacert, verbose):
 @click.option(
     "--image-name",
     "-I",
-    help="Either \"Local\" or the image name of the target cache's execution environment.",
+    help='Either "Local" or the image name of the target cache\'s execution environment.',
 )
 @click.option(
     "--dry-run",
@@ -2528,7 +2530,6 @@ def system_caches_delete(name, server, api_key, insecure, cacert, verbose, langu
         logger.debug(result)
 
 
-
 if __name__ == "__main__":
     cli()
     click.echo()

tests/test_api.py

@@ -82,55 +82,40 @@ def test_connect_authorization_header(self):
         self.assertEqual(none_connect_client.get_authorization(), None)
 
 
-
 class TestSystemRuntimeCachesAPI(TestCase):
     # RSConnectExecutor.list_runtime_caches() returns the resulting JSON from the server.
     @httpretty.activate(verbose=True, allow_net_connect=False)
     def test_client_system_caches_runtime_list(self):
         ce = RSConnectExecutor(None, "http://test-server/", "api_key")
         mocked_response = {
             "caches": [
-                {
-                    "language": "R",
-                    "version": "3.6.3",
-                    "image_name": "Local"
-                },
-                {
-                    "language": "Python",
-                    "version": "5.6.7",
-                    "image_name": "teapot.bak"
-                }
+                {"language": "R", "version": "3.6.3", "image_name": "Local"},
+                {"language": "Python", "version": "5.6.7", "image_name": "teapot.bak"},
             ]
         }
         httpretty.register_uri(
             httpretty.GET,
             "http://test-server/__api__/v1/system/caches/runtime",
             body=json.dumps(mocked_response),
             status=200,
-            forcing_headers={'Content-Type': 'application/json'}
+            forcing_headers={"Content-Type": "application/json"},
         )
         result = ce.list_runtime_caches()
         self.assertDictEqual(result, mocked_response)
 
-
     # # RSConnectExecutor.delete_runtime_cache() dry run returns expected request
     # # RSConnectExecutor.delete_runtime_cache() dry run prints expected messages
     @httpretty.activate(verbose=True, allow_net_connect=False)
     def test_executor_delete_runtime_cache_dry_run(self):
         ce = RSConnectExecutor(None, "http://test-server/", "api_key")
-        mocked_output = {
-            "language": "Python",
-            "version": "1.2.3",
-            "image_name": "teapot",
-            "task_id": None
-        }
+        mocked_output = {"language": "Python", "version": "1.2.3", "image_name": "teapot", "task_id": None}
 
         httpretty.register_uri(
             httpretty.DELETE,
             "http://test-server/__api__/v1/system/caches/runtime",
             body=json.dumps(mocked_output),
             status=200,
-            forcing_headers={'Content-Type': 'application/json'}
+            forcing_headers={"Content-Type": "application/json"},
         )
 
         captured_output = io.StringIO()
@@ -140,14 +125,8 @@ def test_executor_delete_runtime_cache_dry_run(self):
 
         # Print expectations
         output_lines = captured_output.getvalue().splitlines()
-        self.assertEqual(
-            output_lines[0],
-            "Would delete cache: 'Python', version: '1.2.3', image_name: 'teapot'"
-        )
-        self.assertEqual(
-            output_lines[1],
-            "Dry run finished"
-        )
+        self.assertEqual(output_lines[0], "Would delete cache: 'Python', version: '1.2.3', image_name: 'teapot'")
+        self.assertEqual(output_lines[1], "Dry run finished")
 
         # Result expectations
         self.assertDictEqual(mocked_output, result)
@@ -161,37 +140,32 @@ def test_executor_delete_runtime_cache_wet_run(self):
             "language": "Python",
             "version": "1.2.3",
             "image_name": "teapot",
-            "task_id": "this_is_a_task_id"
+            "task_id": "this_is_a_task_id",
         }
         httpretty.register_uri(
             httpretty.DELETE,
             "http://test-server/__api__/v1/system/caches/runtime",
             body=json.dumps(mocked_delete_output),
             status=200,
-            forcing_headers={'Content-Type': 'application/json'}
+            forcing_headers={"Content-Type": "application/json"},
         )
 
         mocked_task_status = {
             "id": "this_is_a_task_id",
             "user_id": 1,
-            "status": [
-                "Removing runtime cache"
-            ],
-            "result": {
-                "type": "",
-                "data": None
-            },
+            "status": ["Removing runtime cache"],
+            "result": {"type": "", "data": None},
             "finished": True,
             "code": 0,
             "error": "",
-            "last_status": 1
+            "last_status": 1,
         }
         httpretty.register_uri(
             httpretty.GET,
             "http://test-server/__api__/tasks/this_is_a_task_id",
             body=json.dumps(mocked_task_status),
             status=200,
-            forcing_headers={'Content-Type': 'application/json'}
+            forcing_headers={"Content-Type": "application/json"},
         )
 
         captured_output = io.StringIO()
@@ -203,12 +177,9 @@ def test_executor_delete_runtime_cache_wet_run(self):
         output_lines = captured_output.getvalue().splitlines()
         self.assertEqual(
             output_lines[0],
-            "Deleting cache: 'Python', version: '1.2.3', image_name: 'teapot', task_id: 'this_is_a_task_id'"
-        )
-        self.assertEqual(
-            output_lines[1],
-            "Cache deletion finished"
+            "Deleting cache: 'Python', version: '1.2.3', image_name: 'teapot', task_id: 'this_is_a_task_id'",
         )
+        self.assertEqual(output_lines[1], "Cache deletion finished")
 
         # Result expectations
         self.assertDictEqual(mocked_task_status, result)
@@ -217,27 +188,19 @@ def test_executor_delete_runtime_cache_wet_run(self):
     @httpretty.activate(verbose=True, allow_net_connect=False)
     def test_executor_delete_runtime_cache_error(self):
         ce = RSConnectExecutor(None, "http://test-server/", "api_key")
-        mocked_delete_output = {
-            "code": 4,
-            "error": "Cache path does not exist",
-            "payload": None
-            }
+        mocked_delete_output = {"code": 4, "error": "Cache path does not exist", "payload": None}
         httpretty.register_uri(
             httpretty.DELETE,
             "http://test-server/__api__/v1/system/caches/runtime",
             body=json.dumps(mocked_delete_output),
             status=404,
-            forcing_headers={'Content-Type': 'application/json'}
+            forcing_headers={"Content-Type": "application/json"},
         )
 
         with self.assertRaisesRegex(RSConnectException, "Cache path does not exist"):
             result = ce.delete_runtime_cache(language="Python", version="1.2.3", image_name="teapot", dry_run=False)
 
 
-
-
-
-
 class RSConnectClientTestCase(TestCase):
     def test_deploy_existing_application_with_failure(self):
         with patch.object(RSConnectClient, "__init__", lambda _, server, cookies, timeout: None):

tests/test_certificates.py

@@ -5,7 +5,6 @@
 
 
 class ParseCertificateFileTestCase(TestCase):
-
     def test_parse_certificate_file_ca_bundle(self):
         res = read_certificate_file("tests/testdata/certificates/localhost.ca-bundle")
         self.assertTrue(res)