mirror of
https://github.com/apple/container.git
synced 2026-07-17 06:57:05 +00:00
Ramsyana
21cfebb475
This PR resolves a race condition when removing a container immediately after stopping it, caused by the `stop` command returning before the container fully transitions to the stopped state (#130). **Changes:** - Enhanced `TestCLIRmRace.swift` with robust test logic and helper methods (`containerExists`, `safeRemove`). - Improved error handling to distinguish race conditions from successful removals. - Added exponential backoff retry logic for cleanup operations. - Updated `CLITest.swift` with missing `doRemove` method. - Fixed `BuilderStart.swift` to handle `.stopping` case. - Improved error messages with container ID for better debugging. **Testing:** - ✅ All tests pass (`make test`, `make integration`). - ✅ Verified on macOS 26. - ✅ Race condition test validates success and failure scenarios. - ✅ Code formatted (`make fmt`). Hopefully, this will pass the integration tests on GitHub. Signed-off-by: ramsyana <47033578+ramsyana@users.noreply.github.com>
40 lines
1.5 KiB
Swift
40 lines
1.5 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
import Foundation
|
|
import Testing
|
|
|
|
extension TestCLIBuildBase {
|
|
class CLIBuilderLifecycleTest: TestCLIBuildBase {
|
|
override init() throws {}
|
|
@Test func testBuilderStartStopCommand() throws {
|
|
#expect(throws: Never.self) {
|
|
try self.builderStart()
|
|
try self.waitForBuilderRunning()
|
|
let status = try self.getContainerStatus("buildkit")
|
|
#expect(status == "running", "BuildKit container is not running")
|
|
}
|
|
#expect(throws: Never.self) {
|
|
try self.builderStop()
|
|
let status = try self.getContainerStatus("buildkit")
|
|
#expect(status == "stopped", "BuildKit container is not stopped")
|
|
}
|
|
}
|
|
}
|
|
}
|