From 25c1deec6271197e1db9d23cfe8586da17c563bf Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Fri, 1 Aug 2025 11:42:28 +0200 Subject: [PATCH 1/4] Fix packages caches path --- tests/test_main_system_caches.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_main_system_caches.py b/tests/test_main_system_caches.py index 6abe7e5e..fc1e949c 100644 --- a/tests/test_main_system_caches.py +++ b/tests/test_main_system_caches.py @@ -10,10 +10,10 @@ CONNECT_SERVER = "http://localhost:3939" CONNECT_KEYS_JSON = "vetiver-testing/rsconnect_api_keys.json" -ADD_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/pip/1.2.3" -RM_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/pip/1.2.3" +ADD_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/_packages_cache/pip/1.2.3" +RM_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/_packages_cache/pip/1.2.3" # The following returns int(0) if dir exists, else int(256). -CACHE_EXISTS_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/pip/1.2.3 ]" +CACHE_EXISTS_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/_packages_cache/pip/1.2.3 ]" SERVICE_RUNNING_COMMAND = "docker compose ps --services --filter 'status=running' | grep rsconnect" From 1c33d1768be8477a8b65e7ddc67ecbc6517ba912 Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Fri, 1 Aug 2025 11:49:49 +0200 Subject: [PATCH 2/4] Make linting happy --- tests/test_main_system_caches.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/test_main_system_caches.py b/tests/test_main_system_caches.py index fc1e949c..02a91703 100644 --- a/tests/test_main_system_caches.py +++ b/tests/test_main_system_caches.py @@ -10,10 +10,16 @@ CONNECT_SERVER = "http://localhost:3939" CONNECT_KEYS_JSON = "vetiver-testing/rsconnect_api_keys.json" -ADD_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/_packages_cache/pip/1.2.3" -RM_CACHE_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/_packages_cache/pip/1.2.3" +ADD_CACHE_COMMAND = ( + "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/_packages_cache/pip/1.2.3" +) +RM_CACHE_COMMAND = ( + "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/_packages_cache/pip/1.2.3" +) # The following returns int(0) if dir exists, else int(256). -CACHE_EXISTS_COMMAND = "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/_packages_cache/pip/1.2.3 ]" +CACHE_EXISTS_COMMAND = ( + "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/_packages_cache/pip/1.2.3 ]" +) SERVICE_RUNNING_COMMAND = "docker compose ps --services --filter 'status=running' | grep rsconnect" From 38c0fe6fdd302ceeefafc279ae0316d1a479d2ad Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Fri, 1 Aug 2025 11:52:08 +0200 Subject: [PATCH 3/4] Remove too specific test --- tests/test_main_system_caches.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/test_main_system_caches.py b/tests/test_main_system_caches.py index 02a91703..f1a5d8e8 100644 --- a/tests/test_main_system_caches.py +++ b/tests/test_main_system_caches.py @@ -137,19 +137,6 @@ def test_system_caches_delete_admin(self): # TODO: Unsure how to test log messages received from Connect. - # Admins cannot delete caches that do not exist - def test_system_caches_delete_admin_nonexistent(self): - api_key = get_key("admin") - runner = CliRunner() - - args = ["system", "caches", "delete", "--language", "Python", "--version", "0.1.2", "--image-name", "Local"] - apply_common_args(args, server=CONNECT_SERVER, key=api_key) - - result = runner.invoke(cli, args) - self.assertEqual(result.exit_code, 1) - - self.assertRegex(result.output, "Cache does not exist") - # --version and --language flags are required def test_system_caches_delete_required_flags(self): api_key = get_key("admin") From 2412208f8c99263cd8752083386f29b440851ec6 Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Fri, 1 Aug 2025 12:03:43 +0200 Subject: [PATCH 4/4] Refactor a bit --- tests/test_main_system_caches.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/test_main_system_caches.py b/tests/test_main_system_caches.py index f1a5d8e8..fe1f32b5 100644 --- a/tests/test_main_system_caches.py +++ b/tests/test_main_system_caches.py @@ -9,17 +9,12 @@ CONNECT_SERVER = "http://localhost:3939" CONNECT_KEYS_JSON = "vetiver-testing/rsconnect_api_keys.json" +CONNECT_CACHE_DIR = "/data/python-environments/_packages_cache" -ADD_CACHE_COMMAND = ( - "docker compose exec -u rstudio-connect -T rsconnect mkdir -p /data/python-environments/_packages_cache/pip/1.2.3" -) -RM_CACHE_COMMAND = ( - "docker compose exec -u rstudio-connect -T rsconnect rm -Rf /data/python-environments/_packages_cache/pip/1.2.3" -) +ADD_CACHE_COMMAND = f"docker compose exec -u rstudio-connect -T rsconnect mkdir -p {CONNECT_CACHE_DIR}/pip/1.2.3" +RM_CACHE_COMMAND = f"docker compose exec -u rstudio-connect -T rsconnect rm -Rf {CONNECT_CACHE_DIR}/pip/1.2.3" # The following returns int(0) if dir exists, else int(256). -CACHE_EXISTS_COMMAND = ( - "docker compose exec -u rstudio-connect -T rsconnect [ -d /data/python-environments/_packages_cache/pip/1.2.3 ]" -) +CACHE_EXISTS_COMMAND = f"docker compose exec -u rstudio-connect -T rsconnect [ -d {CONNECT_CACHE_DIR}/pip/1.2.3 ]" SERVICE_RUNNING_COMMAND = "docker compose ps --services --filter 'status=running' | grep rsconnect"