integration-tests: use HttpWaitStrategy

fix(control-socket): use .path instead of .path() for stale socket cleanup
Use URL's .path property instead of .path() method when removing stale control sockets in ControlSocket.run(). The .path() method returns only the relative component ('control.sock') while .path resolves to the full absolute path. Since the cwd change happens after the cleanup, removeItem silently failed to find the socket. Add unit tests verifying controlSocketURL resolves correctly for both absolute cleanup and relative binding use cases. Fixes: https://github.com/cirruslabs/tart/issues/1220
2026-10-01 11:47:20 +02:00 · 2026-05-13 14:09:24 +02:00 · 2026-05-12 23:54:42 +02:00 · 2026-05-12 21:45:18 +00:00 · 2026-04-11 22:33:36 -04:00 · 2026-04-11 22:26:52 -04:00
28 changed files with 256 additions and 36 deletions
@@ -103,7 +103,6 @@ task:
  only_if: $CIRRUS_TAG != ''
  depends_on:
    - lint
-    - test
    - build
  macos_instance:
    image: ghcr.io/cirruslabs/macos-runner:tahoe
@@ -25,20 +25,26 @@ universal_binaries:
  - name_template: tart.app/Contents/MacOS/tart
    replace: true
    hooks:
-      post: gon gon.hcl
+      post:
+        - mkdir -p dist/tart_darwin_all/tart.app/Contents/Resources
+        - cp Resources/embedded.provisionprofile dist/tart_darwin_all/tart.app/Contents/
+        - cp Resources/Info.plist dist/tart_darwin_all/tart.app/Contents/
+        - cp "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" dist/tart_darwin_all/tart.app/Contents/Resources/
+        - gon gon.hcl

 archives:
  - name_template: "{{ .ProjectName }}"
    files:
-      - src: Resources/embedded.provisionprofile
-        dst: tart.app/Contents
-        strip_parent: true
-      - src: Resources/Info.plist
-        dst: tart.app/Contents
-        strip_parent: true
-      - src: Resources/AppIcon.png
-        dst: tart.app/Contents/Resources
-        strip_parent: true
+      - src: dist/tart_darwin_all/tart.app/Contents/Info.plist
+        dst: tart.app/Contents/Info.plist
+      - src: dist/tart_darwin_all/tart.app/Contents/embedded.provisionprofile
+        dst: tart.app/Contents/embedded.provisionprofile
+      - src: dist/tart_darwin_all/tart.app/Contents/Resources/UPW Tart.icns
+        dst: tart.app/Contents/Resources/UPW Tart.icns
+      - src: dist/tart_darwin_all/tart.app/Contents/Resources/Assets.car
+        dst: tart.app/Contents/Resources/Assets.car
+      - src: dist/tart_darwin_all/tart.app/Contents/_CodeSignature/CodeResources
+        dst: tart.app/Contents/_CodeSignature/CodeResources
      - LICENSE

 release:
@@ -65,6 +71,8 @@ brews:
    install: |
      libexec.install Dir["*"]
      bin.write_exec_script "#{libexec}/tart.app/Contents/MacOS/tart"
-      generate_completions_from_executable(libexec/"tart.app/Contents/MacOS/tart", "--generate-completion-script")
    custom_block: |
      depends_on :macos => :ventura
+      def post_install
+        generate_completions_from_executable(libexec/"tart.app/Contents/MacOS/tart", "--generate-completion-script")
+      end
@@ -7,15 +7,17 @@
 	<key>CFBundleDisplayName</key>
 	<string>Tart</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.cirruslabs.tart</string>
+	<string>com.github.cirruslabs.tart</string>
 	<key>CFBundleExecutable</key>
 	<string>tart</string>
-  <key>LSApplicationCategoryType</key>
-  <string>public.app-category.developer-tools</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>AppIcon.png</string>
-	</array>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
+	<key>CFBundleIconFile</key>
+	<string>UPW Tart</string>
+	<key>CFBundleIconName</key>
+	<string>UPW Tart</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -0,0 +1,140 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "blend-mode" : "normal",
+      "blur-material" : 0.5,
+      "layers" : [
+        {
+          "hidden" : false,
+          "image-name-specializations" : [
+            {
+              "value" : "4.4-–-layer.png"
+            },
+            {
+              "idiom" : "square",
+              "value" : "UPW Tart L4.png"
+            }
+          ],
+          "name" : "UPW Tart L4"
+        }
+      ],
+      "opacity" : 1,
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 1
+      },
+      "specular" : true,
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.25
+      }
+    },
+    {
+      "layers" : [
+        {
+          "image-name-specializations" : [
+            {
+              "value" : "3.3-–-layer.png"
+            },
+            {
+              "idiom" : "square",
+              "value" : "UPW Tart L3.png"
+            }
+          ],
+          "name" : "UPW Tart L3",
+          "position-specializations" : [
+            {
+              "idiom" : "square",
+              "value" : {
+                "scale" : 1,
+                "translation-in-points" : [
+                  0,
+                  0
+                ]
+              }
+            }
+          ]
+        }
+      ],
+      "shadow" : {
+        "kind" : "none",
+        "opacity" : 1
+      },
+      "specular" : false,
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.25
+      }
+    },
+    {
+      "blur-material" : null,
+      "layers" : [
+        {
+          "image-name-specializations" : [
+            {
+              "value" : "2.2-–-layer.png"
+            },
+            {
+              "idiom" : "square",
+              "value" : "UPW Tart L2.png"
+            }
+          ],
+          "name" : "UPW Tart L2"
+        }
+      ],
+      "position-specializations" : [
+        {
+          "idiom" : "square",
+          "value" : {
+            "scale" : 1,
+            "translation-in-points" : [
+              0,
+              0
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "none",
+        "opacity" : 1
+      },
+      "specular" : true,
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.25
+      }
+    },
+    {
+      "layers" : [
+        {
+          "image-name-specializations" : [
+            {
+              "value" : "1.1-–-layer.png"
+            },
+            {
+              "idiom" : "square",
+              "value" : "UPW Tart L1.png"
+            }
+          ],
+          "name" : "UPW Tart L1"
+        }
+      ],
+      "shadow" : {
+        "kind" : "layer-color",
+        "opacity" : 0.5
+      },
+      "specular" : true,
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.25
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>UPW Tart</string>
+	<key>CFBundleIconName</key>
+	<string>UPW Tart</string>
+</dict>
+</plist>
@@ -19,7 +19,7 @@ class ControlSocket {
  func run() async throws {
    // Remove control socket file from previous "tart run" invocations,
    // if any, otherwise we may get the "address already in use" error
-    try? FileManager.default.removeItem(atPath: controlSocketURL.path())
+    try? FileManager.default.removeItem(atPath: controlSocketURL.path)

    // Change the current working directory to a VM's base directory
    // to work around Unix domain socket 104 byte limitation [1]
@@ -0,0 +1,28 @@
+import XCTest
+@testable import tart
+
+final class ControlSocketURLTests: XCTestCase {
+  func testControlSocketURLResolvesToAbsolutePath() throws {
+    let baseURL = URL(fileURLWithPath: "/Users/test/.tart/vms/myvm/")
+    let vmDir = VMDirectory(baseURL: baseURL)
+
+    // The .path property resolves relative URLs to absolute paths,
+    // which is required for stale socket cleanup in ControlSocket.run()
+    // since it happens before the working directory is changed.
+    XCTAssertEqual(
+      vmDir.controlSocketURL.path,
+      "/Users/test/.tart/vms/myvm/control.sock"
+    )
+  }
+
+  func testControlSocketURLRelativePathIsJustFilename() throws {
+    let baseURL = URL(fileURLWithPath: "/Users/test/.tart/vms/myvm/")
+    let vmDir = VMDirectory(baseURL: baseURL)
+
+    // The .relativePath is used for socket binding after cwd is changed
+    XCTAssertEqual(
+      vmDir.controlSocketURL.relativePath,
+      "control.sock"
+    )
+  }
+}
@@ -14,7 +14,7 @@ final class LayerizerTests: XCTestCase {
    do {
      registryRunner = try await RegistryRunner()
    } catch {
-      try XCTSkipIf(ProcessInfo.processInfo.environment["CI"] == nil)
+      try XCTSkip("Registry is unavailable: \(error)")
    }
  }

@@ -26,7 +26,7 @@ final class LayerizerTests: XCTestCase {

  func testDiskV2() async throws {
    // Original disk file to be pushed to the registry
-    let originalDiskFileURL = try fileWithRandomData(sizeBytes: 5 * 1024 * 1024 * 1024)
+    let originalDiskFileURL = try fileWithRandomData(sizeBytes: 1 * 1024 * 1024 * 1024)
    addTeardownBlock {
      try FileManager.default.removeItem(at: originalDiskFileURL)
    }
@@ -10,7 +10,7 @@ final class RegistryTests: XCTestCase {
    do {
      registryRunner = try await RegistryRunner()
    } catch {
-      try XCTSkipIf(ProcessInfo.processInfo.environment["CI"] == nil)
+      try XCTSkip("Registry is unavailable: \(error)")
    }
  }

@@ -13,7 +13,7 @@ class RegistryRunner {
    let stdoutPipe = Pipe()

    let proc = Process()
-    proc.executableURL = URL(fileURLWithPath: "/usr/local/bin/docker")
+    proc.executableURL = URL(fileURLWithPath: "/opt/homebrew/bin/docker")
    proc.arguments = arguments
    proc.standardOutput = stdoutPipe
    try proc.run()
@@ -31,7 +31,7 @@ class RegistryRunner {

  init() async throws {
    // Start container
-    let container = try Self.dockerCmd("run", "-d", "--rm", "-p", "127.0.0.1:0:5000", "registry:2")
+    let container = try Self.dockerCmd("run", "-d", "--rm", "-p", "127.0.0.1::5000", "registry:2")
      .trimmingCharacters(in: CharacterSet.newlines)
    containerID = container

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# Set shell options to enable fail-fast behavior
+#
+# * -e: fail the script when an error occurs or command fails
+# * -u: fail the script when attempting to reference unset parameters
+# * -o pipefail: by default an exit status of a pipeline is that of its
+#                last command, this fails the pipe early if an error in
+#                any of its commands occurs
+#
+set -euo pipefail
+
+OUTPUT_PATH="Resources/actool"
+PLIST_PATH="$OUTPUT_PATH/Info.plist"
+
+rm -rf "${OUTPUT_PATH}"
+mkdir -p "${OUTPUT_PATH}"
+
+actool "Resources/UPW Tart.icon" \
+  --compile "${OUTPUT_PATH}" \
+  --output-format human-readable-text \
+  --notices \
+  --warnings \
+  --errors \
+  --app-icon "UPW Tart" \
+  --output-partial-info-plist $PLIST_PATH \
+  --include-all-app-icons \
+  --target-device mac \
+  --minimum-deployment-target 13.0 \
+  --platform macosx
@@ -59,7 +59,7 @@ Remote images are pulled into `~/.tart/cache/OCIs/`.
 ## Nested virtualization support?

 Tart is limited by functionality of Apple's `Virtualization.Framework`. At the moment `Virtualization.Framework`
-supports nested virtualization only on M3 or M4 chips running macOS 15 (Sequoia) or later. By default, it is disabled, but can be enabled by passing the `--nested` flag to `tart run`.
+supports nested virtualization only on M3 or M4 chips running macOS 15 (Sequoia) or later and [only for Linux VMs](https://github.com/cirruslabs/tart/issues/1231#issuecomment-4410915463). By default, it is disabled, but can be enabled by passing the `--nested` flag to `tart run`.

 ## Connecting to a service running on host

@@ -1,5 +1,11 @@
 {% extends "base.html" %}

+{% block announce %}
+<a href="https://cirruslabs.org/">
+  ️🎉🎉🎉️&nbsp&nbspBig milestone for Cirrus Labs &mdash; we’re joining <strong>OpenAI</strong> to work on Agent Infrastructure&nbsp;&nbsp;🎉🎉🎉
+</a>
+{% endblock %}
+
 <!-- Render landing page under tabs -->
 {% block tabs %} {{ super() }}

@@ -1,4 +1,4 @@
-source = [ "dist/tart_darwin_all/tart.app/Contents/MacOS/tart" ]
+source = [ "dist/tart_darwin_all/tart.app" ]
 bundle_id = "com.github.cirruslabs.tart"

 apple_id {
@@ -1,7 +1,5 @@
-import requests
-
-from testcontainers.core.waiting_utils import wait_container_is_ready
 from testcontainers.core.container import DockerContainer
+from testcontainers.core.wait_strategies import HttpWaitStrategy


 class DockerRegistry(DockerContainer):
@@ -10,11 +8,9 @@ class DockerRegistry(DockerContainer):
    def __init__(self):
        super().__init__("registry:2")
        self.with_exposed_ports(self._default_exposed_port)
+        self.waiting_for(HttpWaitStrategy(self._default_exposed_port, "/v2/").for_status_code(200))

-    @wait_container_is_ready(requests.exceptions.ConnectionError)
    def remote_name(self, for_vm: str):
        exposed_port = self.get_exposed_port(self._default_exposed_port)

-        requests.get(f"http://127.0.0.1:{exposed_port}/v2/")
-
        return f"127.0.0.1:{exposed_port}/tart/{for_vm}:latest"
@@ -46,7 +46,7 @@ def vm_with_random_disk(tart):
    disk_path = os.path.join(tart.home(), "vms", vm_name, "disk.img")

    with tempfile.NamedTemporaryFile(delete=False) as tf:
-        tf.write(os.urandom(amount_to_transfer.bytes))
+        tf.write(os.urandom(int(amount_to_transfer.bytes)))
        tf.close()
        os.rename(tf.name, disk_path)

@@ -6,13 +6,14 @@
 set -e

 swift build --product tart
-codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/debug/tart

 rm -Rf .build/tart.app/
 mkdir -p .build/tart.app/Contents/MacOS .build/tart.app/Contents/Resources
 cp -c .build/debug/tart .build/tart.app/Contents/MacOS/tart
 cp -c Resources/embedded.provisionprofile .build/tart.app/Contents/embedded.provisionprofile
 cp -c Resources/Info.plist .build/tart.app/Contents/Info.plist
-cp -c Resources/AppIcon.png .build/tart.app/Contents/Resources
+cp -c "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" .build/tart.app/Contents/Resources/
+
+codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/tart.app

 .build/tart.app/Contents/MacOS/tart "$@"
Author	SHA1	Message	Date
Nikolay Edigaryev	4e0dbcea4b	integration-tests: use HttpWaitStrategy	2026-05-13 14:09:24 +02:00
Sean McLoughlin	3f1624e31a	fix(control-socket): use .path instead of .path() for stale socket cleanup Use URL's .path property instead of .path() method when removing stale control sockets in ControlSocket.run(). The .path() method returns only the relative component ('control.sock') while .path resolves to the full absolute path. Since the cwd change happens after the cleanup, removeItem silently failed to find the socket. Add unit tests verifying controlSocketURL resolves correctly for both absolute cleanup and relative binding use cases. Fixes: https://github.com/cirruslabs/tart/issues/1220	2026-05-12 23:54:42 +02:00
Nikolay Edigaryev	5287b597a1	docs: clarify that nested virtualization is only for Linux VMs for now (#1233 )	2026-05-12 21:45:18 +00:00
Fedor Korotkov	8aa377b71e	Skip integration test gate for release (#1229 )	2026-04-11 22:33:36 -04:00
Fedor Korotkov	1e52e17c21	Move brew completions to post_install (#1227 ) * Move brew completions to post_install * Reduce Layerizer test disk fixture size to 1GB * Skip registry integration tests on Docker startup failure	2026-04-11 22:26:52 -04:00
Nikolay Edigaryev	d39f7c6036	Docker-related fixes (#1221 ) * tests: fix RegistryRunner's "-p" specification passed to "docker" * tests: "docker" binary is now installed from Homebrew	2026-04-09 21:00:36 -07:00
Fedor Korotkov	abfbb10618	[docs] Add announcement about joining OpenAI (#1223 )	2026-04-07 03:55:20 -07:00
Nikolay Edigaryev	094f850046	Add Liquid Glass icon and sign the whole app bundle (#1216 )	2026-03-20 23:19:21 +01:00