Skip to content

Commit 9b657ab

Browse files
committed
wip: force tests to use podman as well
1 parent 781bd1d commit 9b657ab

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ final class RepeatedBuildTests: XCTestCase {
126126
// Test with no arguments by default:
127127
var possibleArguments = ["--host-toolchain"]
128128
do {
129-
try await Shell.run("docker ps")
129+
try await Shell.run("podman ps")
130130
possibleArguments.append("--with-docker --linux-distribution-name rhel --linux-distribution-version ubi9")
131131
} catch {
132132
self.logger.warning("Docker CLI does not seem to be working, skipping tests that involve Docker.")
@@ -231,7 +231,7 @@ func buildTestcase(_ logger: Logger, testcase: String, bundleName: String, tempD
231231
logger.info("Building test project in 6.0-\(containerVersion) container")
232232
buildOutput = try await Shell.readStdout(
233233
"""
234-
docker run --rm -v \(testPackageDir):/src \
234+
podman run --rm -v \(testPackageDir):/src \
235235
-v $HOME/.swiftpm/swift-sdks:/root/.swiftpm/swift-sdks \
236236
--workdir /src swift:6.0-\(containerVersion) \
237237
/bin/bash -c "swift build --scratch-path /root/.build --experimental-swift-sdk \(bundleName)"
@@ -243,7 +243,7 @@ func buildTestcase(_ logger: Logger, testcase: String, bundleName: String, tempD
243243
logger.info("Building test project in 6.0-\(containerVersion) container with static-swift-stdlib")
244244
buildOutput = try await Shell.readStdout(
245245
"""
246-
docker run --rm -v \(testPackageDir):/src \
246+
podman run --rm -v \(testPackageDir):/src \
247247
-v $HOME/.swiftpm/swift-sdks:/root/.swiftpm/swift-sdks \
248248
--workdir /src swift:6.0-\(containerVersion) \
249249
/bin/bash -c "swift build --scratch-path /root/.build --experimental-swift-sdk \(bundleName) --static-swift-stdlib"
@@ -281,7 +281,7 @@ func buildTestcases(config: SDKConfiguration) async throws {
281281

282282
if config.withDocker {
283283
do {
284-
try await Shell.run("docker ps")
284+
try await Shell.run("podman ps")
285285
} catch {
286286
throw XCTSkip("Container runtime is not available - skipping tests which require it")
287287
}

0 commit comments

Comments
 (0)