didericis
8f9005582b
On Linux the guest kernel's LOCAL routing table routes all 127.0.0.0/8 to the guest's own loopback interface (priority 0, checked before any main-table route), so TSI never sees connections to the per-bottle loopback alias — the fix_guest_ loopback_routing approach confirmed this at the kernel level. Use the per-bottle docker bridge gateway (192.168.N.1) instead. It is not a loopback address, so the guest routes it via eth0 and TSI intercepts it normally. The TSI allowlist remains a /32 that is distinct from the container IP (192.168.N.2), so direct bypass to egress:9099 is still blocked by TSI. Changes: - Add _proxy_host() helper: returns bundle_gateway on Linux, loopback alias on macOS - Thread proxy_host through _start_bundle, _discover_urls, _launch_vm, and _bundle_launch_spec (publish_host_ip) - Remove _fix_guest_loopback_routing (no longer needed) - Relax proxy-URL assertion in the integration test to accept any http://IP:port (with a comment explaining the difference) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
65 lines
2.2 KiB
Python
65 lines
2.2 KiB
Python
"""Integration: PRD 0023 chunk 2b — smolvm subprocess wrapper
|
|
exercised against the real binary.
|
|
|
|
The full machine-lifecycle round trip (create → start → exec →
|
|
delete) is gated behind macOS/Linux platform check and lives
|
|
in chunk 2d's smoke. This file just verifies `is_available()`
|
|
correctly reports presence and `_smolvm()` can run a no-op
|
|
subcommand without errors — enough to flag wrapper drift if
|
|
smolvm's flag parser changes shape across versions."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import platform
|
|
import subprocess
|
|
import unittest
|
|
|
|
from bot_bottle.backend.smolmachines.smolvm import is_available
|
|
|
|
|
|
@unittest.skipIf(
|
|
os.environ.get("GITEA_ACTIONS") == "true",
|
|
"skipped under act_runner: smolvm not installed on the runner",
|
|
)
|
|
@unittest.skipUnless(
|
|
platform.system() in ("Darwin", "Linux"),
|
|
"smolvm requires macOS or Linux",
|
|
)
|
|
@unittest.skipUnless(
|
|
is_available(),
|
|
"smolvm not on PATH; install via "
|
|
"curl -sSL https://smolmachines.com/install.sh | sh",
|
|
)
|
|
class TestSmolvmSmoke(unittest.TestCase):
|
|
def test_smolvm_help_responds(self):
|
|
# `smolvm --help` exits 0 (per `smolvm machine --help`
|
|
# convention) — verifies the binary launches and the
|
|
# top-level parser is intact.
|
|
r = subprocess.run(
|
|
["smolvm", "--help"],
|
|
capture_output=True, text=True, check=False,
|
|
)
|
|
# Either exit-code 0 (clean) or 1 (some CLIs return 1
|
|
# from --help by convention; smolvm 0.8.0 does this). The
|
|
# point is the binary runs and emits help text.
|
|
self.assertIn("smolvm", r.stdout)
|
|
self.assertIn("machine", r.stdout)
|
|
|
|
def test_machine_ls_empty_returns_json_array(self):
|
|
# `machine ls --json` is the contract chunk 4's
|
|
# list_active wires to. Lock in that the JSON shape is
|
|
# parseable now so chunk 4 doesn't surprise us.
|
|
import json
|
|
r = subprocess.run(
|
|
["smolvm", "machine", "ls", "--json"],
|
|
capture_output=True, text=True, check=False,
|
|
)
|
|
self.assertEqual(0, r.returncode, r.stderr)
|
|
parsed = json.loads(r.stdout)
|
|
self.assertIsInstance(parsed, list)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|