Update tests

Author: toph-allen

.gitignore

@@ -25,3 +25,6 @@
 htmlcov
 test-home/
 venv
+
+# Temporary dev files
+vetiver-testing/rsconnect_api_keys.json

rsconnect/api.py

@@ -998,12 +998,14 @@ def runtime_caches(self):
     def delete_runtime_cache(self, language, version, image_name, dry_run):
         target = {"language": language, "version": version, "image_name": image_name, "dry_run": dry_run}
         result = self.client.system_caches_runtime_delete(target)
+        self.state["result"] = result
         if result["task_id"] is None:
             print("Dry run finished")
         else:
             (log_lines, task_status) = self.client.wait_for_task(
                 result["task_id"], connect_logger.info, raise_on_error=False
             )
+            self.state["task_status"] = task_status
         return self
 
 

tests/test_api.py

@@ -103,6 +103,7 @@ def test_client_system_caches_runtime_list(self):
         result = ce.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):
@@ -119,13 +120,16 @@ def test_executor_delete_runtime_cache_dry_run(self):
 
         captured_output = io.StringIO()
         sys.stdout = captured_output
-        result = ce.delete_runtime_cache(language="Python", version="1.2.3", image_name="teapot", dry_run=True)
+        ce.delete_runtime_cache(language="Python", version="1.2.3", image_name="teapot", dry_run=True)
         sys.stdout = sys.__stdout__
 
         # Print expectations
         output_lines = captured_output.getvalue().splitlines()
         self.assertEqual(output_lines[0], "Dry run finished")
 
+        # Result expectations
+        self.assertDictEqual(mocked_output, ce.state["result"])
+
     # RSConnectExecutor.delete_runtime_cache() wet run returns expected request
     # RSConnectExecutor.delete_runtime_cache() wet run prints expected messages
     @httpretty.activate(verbose=True, allow_net_connect=False)
@@ -165,11 +169,16 @@ def test_executor_delete_runtime_cache_wet_run(self):
 
         captured_output = io.StringIO()
         sys.stdout = captured_output
-        result = ce.delete_runtime_cache(language="Python", version="1.2.3", image_name="teapot", dry_run=False)
+        ce.delete_runtime_cache(language="Python", version="1.2.3", image_name="teapot", dry_run=False)
         sys.stdout = sys.__stdout__
 
         # Print expectations
-        # TODO: Figure out how to capture the output of `connect_logger` and make assertions.
+        # TODO: *We* don't print anything here anymore. Unsure how to capture log messages from Connect.
+        # output_lines = captured_output.getvalue().splitlines()
+        # self.assertEqual(output_lines[0], "Cache deletion finished")
+
+        # Result expectations
+        self.assertDictEqual(mocked_task_status, ce.state["task_status"])
 
     # RSConnectExecutor.delete_runtime_cache() raises the correct error
     @httpretty.activate(verbose=True, allow_net_connect=False)