Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

Fix broken storage tests

f-trycua5c83765edbbe
diff --git a/libs/lume/tests/Mocks/MockVM.swift b/libs/lume/tests/Mocks/MockVM.swift
index 907252da1a..ea21fb6ded 100644
--- a/libs/lume/tests/Mocks/MockVM.swift
+++ b/libs/lume/tests/Mocks/MockVM.swift
@@ -1,15 +1,18 @@
import Foundation
+
@testable import lume
@MainActor
class MockVM: VM {
private var mockIsRunning = false
-
+
override func getOSType() -> String {
return "mock-os"
}
-
- override func setup(ipswPath: String, cpuCount: Int, memorySize: UInt64, diskSize: UInt64, display: String) async throws {
+
+ override func setup(
+ ipswPath: String, cpuCount: Int, memorySize: UInt64, diskSize: UInt64, display: String
+ ) async throws {
// Mock setup implementation
vmDirContext.config.setCpuCount(cpuCount)
vmDirContext.config.setMemorySize(memorySize)
@@ -17,12 +20,19 @@ class MockVM: VM {
vmDirContext.config.setMacAddress("00:11:22:33:44:55")
try vmDirContext.saveConfig()
}
-
- override func run(noDisplay: Bool, sharedDirectories: [SharedDirectory], mount: Path?, vncPort: Int = 0, recoveryMode: Bool = false) async throws {
+
+ override func run(
+ noDisplay: Bool, sharedDirectories: [SharedDirectory], mount: Path?, vncPort: Int = 0,
+ recoveryMode: Bool = false, usbMassStoragePaths: [Path]? = nil
+ ) async throws {
mockIsRunning = true
- try await super.run(noDisplay: noDisplay, sharedDirectories: sharedDirectories, mount: mount, vncPort: vncPort, recoveryMode: recoveryMode)
+ try await super.run(
+ noDisplay: noDisplay, sharedDirectories: sharedDirectories, mount: mount,
+ vncPort: vncPort, recoveryMode: recoveryMode,
+ usbMassStoragePaths: usbMassStoragePaths
+ )
}
-
+
override func stop() async throws {
mockIsRunning = false
try await super.stop()
diff --git a/libs/lume/tests/VM/VMDetailsPrinterTests.swift b/libs/lume/tests/VM/VMDetailsPrinterTests.swift
index 4c8b864ec6..42de5f9f6b 100644
--- a/libs/lume/tests/VM/VMDetailsPrinterTests.swift
+++ b/libs/lume/tests/VM/VMDetailsPrinterTests.swift
@@ -1,70 +1,89 @@
-import Testing
import Foundation
+import Testing
+
@testable import lume
struct VMDetailsPrinterTests {
-
+
@Test func printStatus_whenJSON() throws {
- // Given
- let vms: [VMDetails] = [VMDetails(name: "name",
- os: "os",
- cpuCount: 2,
- memorySize: 1024,
- diskSize: .init(allocated: 24, total: 30),
- display: "1024x768",
- status: "status",
- vncUrl: "vncUrl",
- ipAddress: "0.0.0.0")]
- let jsonEncoder = JSONEncoder()
- jsonEncoder.outputFormatting = .prettyPrinted
- let expectedOutput = try String(data: jsonEncoder.encode(vms), encoding: .utf8)!
-
- // When
- var printedStatus: String?
- try VMDetailsPrinter.printStatus(vms, format: .json, print: { printedStatus = $0 })
+ // Given
+ let vms: [VMDetails] = [
+ VMDetails(
+ name: "name",
+ os: "os",
+ cpuCount: 2,
+ memorySize: 1024,
+ diskSize: .init(allocated: 24, total: 30),
+ display: "1024x768",
+ status: "status",
+ vncUrl: "vncUrl",
+ ipAddress: "0.0.0.0",
+ locationName: "mockLocation")
+ ]
+ let jsonEncoder = JSONEncoder()
+ jsonEncoder.outputFormatting = .prettyPrinted
+ let expectedOutput = try String(data: jsonEncoder.encode(vms), encoding: .utf8)!
- // Then
- // Decode both JSONs and compare the actual data structures
- let jsonDecoder = JSONDecoder()
- let printedVMs = try jsonDecoder.decode([VMDetails].self, from: printedStatus!.data(using: .utf8)!)
- let expectedVMs = try jsonDecoder.decode([VMDetails].self, from: expectedOutput.data(using: .utf8)!)
-
- #expect(printedVMs.count == expectedVMs.count)
- for (printed, expected) in zip(printedVMs, expectedVMs) {
- #expect(printed.name == expected.name)
- #expect(printed.os == expected.os)
- #expect(printed.cpuCount == expected.cpuCount)
- #expect(printed.memorySize == expected.memorySize)
- #expect(printed.diskSize.allocated == expected.diskSize.allocated)
- #expect(printed.diskSize.total == expected.diskSize.total)
- #expect(printed.status == expected.status)
- #expect(printed.vncUrl == expected.vncUrl)
- #expect(printed.ipAddress == expected.ipAddress)
- }
- }
-
- @Test func printStatus_whenNotJSON() throws {
- // Given
- let vms: [VMDetails] = [VMDetails(name: "name",
- os: "os",
- cpuCount: 2,
- memorySize: 1024,
- diskSize: .init(allocated: 24, total: 30),
- display: "1024x768",
- status: "status",
- vncUrl: "vncUrl",
- ipAddress: "0.0.0.0")]
-
- // When
- var printedLines: [String] = []
- try VMDetailsPrinter.printStatus(vms, format: .text, print: { printedLines.append($0) })
+ // When
+ var printedStatus: String?
+ try VMDetailsPrinter.printStatus(vms, format: .json, print: { printedStatus = $0 })
- // Then
- #expect(printedLines.count == 2)
-
- let headerParts = printedLines[0].split(whereSeparator: \.isWhitespace)
- #expect(headerParts == ["name", "os", "cpu", "memory", "disk", "display", "status", "ip", "vnc"])
+ // Then
+ // Decode both JSONs and compare the actual data structures
+ let jsonDecoder = JSONDecoder()
+ let printedVMs = try jsonDecoder.decode(
+ [VMDetails].self, from: printedStatus!.data(using: .utf8)!)
+ let expectedVMs = try jsonDecoder.decode(
+ [VMDetails].self, from: expectedOutput.data(using: .utf8)!)
- #expect(printedLines[1].split(whereSeparator: \.isWhitespace).map(String.init) == ["name", "os", "2", "0.00G", "24.0B/30.0B", "1024x768", "status", "0.0.0.0", "vncUrl"])
+ #expect(printedVMs.count == expectedVMs.count)
+ for (printed, expected) in zip(printedVMs, expectedVMs) {
+ #expect(printed.name == expected.name)
+ #expect(printed.os == expected.os)
+ #expect(printed.cpuCount == expected.cpuCount)
+ #expect(printed.memorySize == expected.memorySize)
+ #expect(printed.diskSize.allocated == expected.diskSize.allocated)
+ #expect(printed.diskSize.total == expected.diskSize.total)
+ #expect(printed.status == expected.status)
+ #expect(printed.vncUrl == expected.vncUrl)
+ #expect(printed.ipAddress == expected.ipAddress)
}
+ }
+
+ @Test func printStatus_whenNotJSON() throws {
+ // Given
+ let vms: [VMDetails] = [
+ VMDetails(
+ name: "name",
+ os: "os",
+ cpuCount: 2,
+ memorySize: 1024,
+ diskSize: .init(allocated: 24, total: 30),
+ display: "1024x768",
+ status: "status",
+ vncUrl: "vncUrl",
+ ipAddress: "0.0.0.0",
+ locationName: "mockLocation")
+ ]
+
+ // When
+ var printedLines: [String] = []
+ try VMDetailsPrinter.printStatus(vms, format: .text, print: { printedLines.append($0) })
+
+ // Then
+ #expect(printedLines.count == 2)
+
+ let headerParts = printedLines[0].split(whereSeparator: \.isWhitespace)
+ #expect(
+ headerParts == [
+ "name", "os", "cpu", "memory", "disk", "display", "status", "storage", "ip", "vnc",
+ ])
+
+ #expect(
+ printedLines[1].split(whereSeparator: \.isWhitespace).map(String.init) == [
+ "name", "os", "2", "0.00G", "24.0B/30.0B", "1024x768", "status", "mockLocation",
+ "0.0.0.0",
+ "vncUrl",
+ ])
+ }
}
diff --git a/libs/lume/tests/VMTests.swift b/libs/lume/tests/VMTests.swift
index 09a56e062a..e7e312878a 100644
--- a/libs/lume/tests/VMTests.swift
+++ b/libs/lume/tests/VMTests.swift
@@ -1,10 +1,11 @@
import Foundation
import Testing
+
@testable import lume
class MockProcessRunner: ProcessRunner {
var runCalls: [(executable: String, arguments: [String])] = []
-
+
func run(executable: String, arguments: [String]) throws {
runCalls.append((executable, arguments))
}
@@ -12,17 +13,17 @@ class MockProcessRunner: ProcessRunner {
private func setupVMDirectory(_ tempDir: URL) throws -> VMDirectory {
let vmDir = VMDirectory(Path(tempDir.path))
-
+
// Create disk image file
let diskPath = vmDir.diskPath
- let diskData = Data(repeating: 0, count: 1024 * 1024) // 1MB mock disk
+ let diskData = Data(repeating: 0, count: 1024 * 1024) // 1MB mock disk
try diskData.write(to: diskPath.url)
-
+
// Create nvram file
let nvramPath = vmDir.nvramPath
- let nvramData = Data(repeating: 0, count: 1024) // 1KB mock nvram
+ let nvramData = Data(repeating: 0, count: 1024) // 1KB mock nvram
try nvramData.write(to: nvramPath.url)
-
+
// Create initial config file
var config = try VMConfig(
os: "mock-os",
@@ -33,11 +34,11 @@ private func setupVMDirectory(_ tempDir: URL) throws -> VMDirectory {
)
config.setMacAddress("00:11:22:33:44:55")
try vmDir.saveConfig(config)
-
+
// Create .initialized file to mark VM as initialized
let initializedPath = vmDir.dir.file(".initialized")
try Data().write(to: initializedPath.url)
-
+
return vmDir
}
@@ -53,16 +54,16 @@ func testVMInitialization() async throws {
diskSize: 1024,
display: "1024x768"
)
- config.setMacAddress("00:11:22:33:44:55") // Set MAC address to avoid nil
+ config.setMacAddress("00:11:22:33:44:55") // Set MAC address to avoid nil
let home = Home(fileManager: FileManager.default)
- let context = VMDirContext(dir: vmDir, config: config, home: home)
-
+ let context = VMDirContext(dir: vmDir, config: config, home: home, storage: nil)
+
let vm = MockVM(
vmDirContext: context,
virtualizationServiceFactory: { _ in MockVMVirtualizationService() },
vncServiceFactory: { MockVNCService(vmDirectory: $0) }
)
-
+
// Test initial state
let details = vm.details
#expect(details.name == vmDir.name)
@@ -85,22 +86,24 @@ func testVMRunAndStop() async throws {
)
config.setMacAddress("00:11:22:33:44:55")
let home = Home(fileManager: FileManager.default)
- let context = VMDirContext(dir: vmDir, config: config, home: home)
-
+ let context = VMDirContext(dir: vmDir, config: config, home: home, storage: nil)
+
let vm = MockVM(
vmDirContext: context,
virtualizationServiceFactory: { _ in MockVMVirtualizationService() },
vncServiceFactory: { MockVNCService(vmDirectory: $0) }
)
-
+
// Test running VM
let runTask = Task {
- try await vm.run(noDisplay: false, sharedDirectories: [], mount: nil, vncPort: 0, recoveryMode: false)
+ try await vm.run(
+ noDisplay: false, sharedDirectories: [], mount: nil as Path?, vncPort: 0,
+ recoveryMode: false)
}
-
+
// Give the VM time to start
try await Task.sleep(nanoseconds: UInt64(1e9))
-
+
// Test stopping VM
try await vm.stop()
runTask.cancel()
@@ -120,22 +123,22 @@ func testVMConfigurationUpdates() async throws {
)
config.setMacAddress("00:11:22:33:44:55")
let home = Home(fileManager: FileManager.default)
- let context = VMDirContext(dir: vmDir, config: config, home: home)
-
+ let context = VMDirContext(dir: vmDir, config: config, home: home, storage: nil)
+
let vm = MockVM(
vmDirContext: context,
virtualizationServiceFactory: { _ in MockVMVirtualizationService() },
vncServiceFactory: { MockVNCService(vmDirectory: $0) }
)
-
+
// Test CPU count update
try vm.setCpuCount(4)
#expect(vm.vmDirContext.config.cpuCount == 4)
-
+
// Test memory size update
try vm.setMemorySize(4096)
#expect(vm.vmDirContext.config.memorySize == 4096)
-
+
// Test MAC address update
try vm.setMacAddress("00:11:22:33:44:66")
#expect(vm.vmDirContext.config.macAddress == "00:11:22:33:44:66")
@@ -155,16 +158,16 @@ func testVMSetup() async throws {
)
config.setMacAddress("00:11:22:33:44:55")
let home = Home(fileManager: FileManager.default)
- let context = VMDirContext(dir: vmDir, config: config, home: home)
-
+ let context = VMDirContext(dir: vmDir, config: config, home: home, storage: nil)
+
let vm = MockVM(
vmDirContext: context,
virtualizationServiceFactory: { _ in MockVMVirtualizationService() },
vncServiceFactory: { MockVNCService(vmDirectory: $0) }
)
-
- let expectedDiskSize: UInt64 = 64 * 1024 * 1024 * 1024 // 64 GB
-
+
+ let expectedDiskSize: UInt64 = 64 * 1024 * 1024 * 1024 // 64 GB
+
try await vm.setup(
ipswPath: "/path/to/mock.ipsw",
cpuCount: 2,
@@ -172,11 +175,13 @@ func testVMSetup() async throws {
diskSize: expectedDiskSize,
display: "1024x768"
)
-
+
#expect(vm.vmDirContext.config.cpuCount == 2)
#expect(vm.vmDirContext.config.memorySize == 2048)
let actualDiskSize = vm.vmDirContext.config.diskSize ?? 0
- #expect(actualDiskSize == expectedDiskSize, "Expected disk size \(expectedDiskSize), but got \(actualDiskSize)")
+ #expect(
+ actualDiskSize == expectedDiskSize,
+ "Expected disk size \(expectedDiskSize), but got \(actualDiskSize)")
#expect(vm.vmDirContext.config.macAddress == "00:11:22:33:44:55")
}
@@ -184,4 +189,4 @@ private func createTempDirectory() throws -> URL {
let tempDir = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
return tempDir
-}
\ No newline at end of file
+}