didericis/bot-bottle
1
0
Fork 0
Code Issues 7 Pull Requests 15 Actions Packages Projects Releases Wiki Activity

fix(smolmachines): commit via exec-tar instead of stop→pack

Browse Source 
smolvm pack create --from-vm requires the VM to be stopped, and stopping
a smolmachines VM terminates any running interactive session.

Instead, mirror the macos-container approach: exec into the running VM as
root and stream the root filesystem via tar (smolvm machine exec -- tar),
build a Docker image from the archive, push to an ephemeral local registry,
and run smolvm pack create --image to produce the .smolmachine artifact.
The VM stays running throughout the commit.

Remove the stop-confirm prompt and machine_is_running check that were
added in the previous commit — neither is needed when we no longer stop.
This commit is contained in:
didericis (claude)
2026-06-23 08:57:06 +00:00
committed by didericis
parent d11e3940fa
commit eb64a52ffa
2 changed files with 94 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/test_backend_freezer.py
+11 -44
View File
@@ -189,61 +189,28 @@ class TestSmolmachinesFreezer(_FakeHomeMixin, unittest.TestCase):
started_at="t", backend="smolmachines",
))
def test_packs_stopped_vm_directly(self):
def test_snapshots_running_vm_without_stopping(self):
"""Commit should exec-tar the running VM, not stop it."""
slug = "dev-abc12"
self._write_meta(slug)
freezer = SmolmachinesFreezer()
agent = _make_agent(slug, "smolmachines")
with patch("bot_bottle.backend.smolmachines.freezer.machine_is_running",
return_value=False), \
patch("bot_bottle.backend.smolmachines.freezer.pack_create_from_vm") as mock_pack, \
with patch("bot_bottle.backend.smolmachines.freezer._snapshot_running_vm") as mock_snap, \
patch("bot_bottle.backend.freeze.info"), \
patch("bot_bottle.backend.smolmachines.freezer.info"):
freezer.commit(agent)
expected_output = bottle_state.bottle_state_dir(slug) / "committed-smolmachine"
mock_pack.assert_called_once_with(f"bot-bottle-{slug}", expected_output)
expected_artifact = str(expected_output.with_name("committed-smolmachine.smolmachine"))
self.assertEqual(expected_artifact, bottle_state.read_committed_image(slug))
expected_binary = bottle_state.bottle_state_dir(slug) / "committed-smolmachine"
mock_snap.assert_called_once_with(
f"bot-bottle-{slug}",
f"bot-bottle-committed-{slug}:latest",
expected_binary,
)
expected_sidecar = str(expected_binary.with_suffix(".smolmachine"))
self.assertEqual(expected_sidecar, bottle_state.read_committed_image(slug))
self.assertTrue(bottle_state.is_preserved(slug))
def test_stops_running_vm_on_yes(self):
slug = "dev-abc12"
self._write_meta(slug)
freezer = SmolmachinesFreezer()
agent = _make_agent(slug, "smolmachines")
with patch("bot_bottle.backend.smolmachines.freezer.machine_is_running",
return_value=True), \
patch("bot_bottle.backend.smolmachines.freezer._read_tty_line", return_value="y"), \
patch("bot_bottle.backend.smolmachines.freezer.machine_stop") as mock_stop, \
patch("bot_bottle.backend.smolmachines.freezer.pack_create_from_vm") as mock_pack, \
patch("bot_bottle.backend.freeze.info"), \
patch("bot_bottle.backend.smolmachines.freezer.info"):
freezer.commit(agent)
mock_stop.assert_called_once_with(f"bot-bottle-{slug}")
mock_pack.assert_called_once()
def test_raises_commit_cancelled_on_no(self):
slug = "dev-abc12"
self._write_meta(slug)
freezer = SmolmachinesFreezer()
agent = _make_agent(slug, "smolmachines")
with patch("bot_bottle.backend.smolmachines.freezer.machine_is_running",
return_value=True), \
patch("bot_bottle.backend.smolmachines.freezer._read_tty_line", return_value="n"), \
patch("bot_bottle.backend.smolmachines.freezer.machine_stop") as mock_stop, \
patch("bot_bottle.backend.smolmachines.freezer.pack_create_from_vm") as mock_pack:
from bot_bottle.backend.freeze import CommitCancelled
with self.assertRaises(CommitCancelled):
freezer.commit(agent)
mock_stop.assert_not_called()
mock_pack.assert_not_called()
if __name__ == "__main__":
unittest.main()