fix: ensure the launcher always mounts cache dirs

canonical · Dec 1, 2023 · 7074e73 · 7074e73
1 parent 52c8f75
commit 7074e73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/craft_providers/lxd/launcher.py b/craft_providers/lxd/launcher.py
@@ -222,7 +222,10 @@ def _create_instance(
         instance.restart()
     else:
         instance.start()
-    base_configuration.wait_until_ready(executor=instance)
+    # Warmup the instance to ensure we have everything set up.
+    # There are cases where setup won't do everything to the base instance that
+    # warmup does to the final instance (such as mounting cache directories).
+    base_configuration.warmup(executor=instance)
 
 
 def _ensure_project_exists(

diff --git a/tests/unit/lxd/test_launcher.py b/tests/unit/lxd/test_launcher.py
@@ -182,7 +182,7 @@ def test_launch_no_base_instance(
     assert mock_base_configuration.mock_calls == [
         call.get_command_environment(),
         call.setup(executor=fake_instance),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -248,7 +248,7 @@ def test_launch_use_base_instance(
         call.get_command_environment(),
         call.get_command_environment(),
         call.setup(executor=fake_base_instance, mount_cache=False),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -528,7 +528,7 @@ def test_launch_existing_base_instance_invalid(
         call.get_command_environment(),
         call.get_command_environment(),
         call.setup(executor=fake_base_instance, mount_cache=False),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -609,7 +609,7 @@ def test_launch_all_opts(
     assert mock_base_configuration.mock_calls == [
         call.get_command_environment(),
         call.setup(executor=fake_instance),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -703,7 +703,7 @@ def test_launch_create_project(
     assert mock_base_configuration.mock_calls == [
         call.get_command_environment(),
         call.setup(executor=fake_instance),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -846,7 +846,7 @@ def test_launch_with_existing_instance_incompatible_with_auto_clean(
         call.get_command_environment(),
         call.warmup(executor=fake_instance),
         call.setup(executor=fake_instance),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -940,7 +940,7 @@ def test_launch_with_existing_ephemeral_instance(
     assert mock_base_configuration.mock_calls == [
         call.get_command_environment(),
         call.setup(executor=fake_instance),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]
 
 
@@ -1134,7 +1134,7 @@ def test_use_snapshots_deprecated(
         call.get_command_environment(),
         call.get_command_environment(),
         call.setup(executor=fake_base_instance, mount_cache=False),
-        call.wait_until_ready(executor=fake_instance),
+        call.warmup(executor=fake_instance),
     ]