lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-22 23:55:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move parser tests that rely on userdefault manipulation to TestCLINoP… (#1299)

Browse Source 
- Fixes #1298 

## Type of Change
- [x] Bug fix
- [ ] New feature  
- [ ] Breaking change
- [ ] Documentation update

## Motivation and Context
Move parser tests that rely on userdefault manipulation to
TestCLINoParallelCases

## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
This commit is contained in:
Raj
2026-03-06 13:53:23 -08:00
committed by GitHub
parent af9515798a
commit 71313ca3d9
2 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/CLITests/TestCLINoParallelCases.swift
+72
View File
@@ -15,6 +15,8 @@
//===----------------------------------------------------------------------===//
import ContainerAPIClient
import ContainerPersistence
import ContainerizationExtras
import ContainerizationOCI
import Foundation
import Testing
@@ -301,4 +303,74 @@ class TestCLINoParallelCases: CLITest {
#expect(statusFinal == 0)
#expect(!listFinal.contains(networkName), "network should be pruned after container is deleted")
}
// MARK: - Parser.resources (DefaultsStore-dependent)
@Test func testResourcesCustomDefaults() throws {
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 2)
#expect(result.memoryInBytes == 2048.mib())
}
@Test func testResourcesBuildPropertyLookup() throws {
DefaultsStore.set(value: "8", key: .defaultBuildCPUs)
DefaultsStore.set(value: "4g", key: .defaultBuildMemory)
defer {
DefaultsStore.unset(key: .defaultBuildCPUs)
DefaultsStore.unset(key: .defaultBuildMemory)
}
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 8)
#expect(result.memoryInBytes == 4096.mib())
}
@Test func testResourcesCPUsFromProperty() throws {
DefaultsStore.set(value: "8", key: .defaultContainerCPUs)
defer { DefaultsStore.unset(key: .defaultContainerCPUs) }
let result = try Parser.resources(cpus: nil, memory: nil)
#expect(result.cpus == 8)
}
@Test func testResourcesMemoryFromProperty() throws {
DefaultsStore.set(value: "2g", key: .defaultContainerMemory)
defer { DefaultsStore.unset(key: .defaultContainerMemory) }
let result = try Parser.resources(cpus: nil, memory: nil)
#expect(result.memoryInBytes == 2048.mib())
}
@Test func testResourcesFlagOverridesProperty() throws {
DefaultsStore.set(value: "8", key: .defaultContainerCPUs)
DefaultsStore.set(value: "2g", key: .defaultContainerMemory)
defer {
DefaultsStore.unset(key: .defaultContainerCPUs)
DefaultsStore.unset(key: .defaultContainerMemory)
}
let result = try Parser.resources(cpus: 1, memory: "256m")
#expect(result.cpus == 1)
#expect(result.memoryInBytes == 256.mib())
}
@Test func testResourcesPropertyKeysAreIsolated() throws {
DefaultsStore.set(value: "16", key: .defaultContainerCPUs)
DefaultsStore.set(value: "8g", key: .defaultContainerMemory)
defer {
DefaultsStore.unset(key: .defaultContainerCPUs)
DefaultsStore.unset(key: .defaultContainerMemory)
}
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 2)
#expect(result.memoryInBytes == 2048.mib())
}
}
Tests/ContainerAPIClientTests/ParserTest.swift
-75
View File
@@ -1045,79 +1045,4 @@ struct ParserTest {
#expect(result[0].hard == UInt64.max)
}
// MARK: - Parser.resources
@Test
func testResourcesCustomDefaults() throws {
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 2)
#expect(result.memoryInBytes == 2048.mib())
}
@Test
func testResourcesBuildPropertyLookup() throws {
DefaultsStore.set(value: "8", key: .defaultBuildCPUs)
DefaultsStore.set(value: "4g", key: .defaultBuildMemory)
defer {
DefaultsStore.unset(key: .defaultBuildCPUs)
DefaultsStore.unset(key: .defaultBuildMemory)
}
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 8)
#expect(result.memoryInBytes == 4096.mib())
}
@Test
func testResourcesCPUsFromProperty() throws {
DefaultsStore.set(value: "8", key: .defaultContainerCPUs)
defer { DefaultsStore.unset(key: .defaultContainerCPUs) }
let result = try Parser.resources(cpus: nil, memory: nil)
#expect(result.cpus == 8)
}
@Test
func testResourcesMemoryFromProperty() throws {
DefaultsStore.set(value: "2g", key: .defaultContainerMemory)
defer { DefaultsStore.unset(key: .defaultContainerMemory) }
let result = try Parser.resources(cpus: nil, memory: nil)
#expect(result.memoryInBytes == 2048.mib())
}
@Test
func testResourcesFlagOverridesProperty() throws {
DefaultsStore.set(value: "8", key: .defaultContainerCPUs)
DefaultsStore.set(value: "2g", key: .defaultContainerMemory)
defer {
DefaultsStore.unset(key: .defaultContainerCPUs)
DefaultsStore.unset(key: .defaultContainerMemory)
}
let result = try Parser.resources(cpus: 1, memory: "256m")
#expect(result.cpus == 1)
#expect(result.memoryInBytes == 256.mib())
}
@Test
func testResourcesPropertyKeysAreIsolated() throws {
DefaultsStore.set(value: "16", key: .defaultContainerCPUs)
DefaultsStore.set(value: "8g", key: .defaultContainerMemory)
defer {
DefaultsStore.unset(key: .defaultContainerCPUs)
DefaultsStore.unset(key: .defaultContainerMemory)
}
let result = try Parser.resources(
cpus: nil, memory: nil,
cpuPropertyKey: .defaultBuildCPUs, memoryPropertyKey: .defaultBuildMemory,
defaultCPUs: 2, defaultMemoryInBytes: 2048.mib()
)
#expect(result.cpus == 2)
#expect(result.memoryInBytes == 2048.mib())
}
}