Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglogan merged 3 commits into from
Dec 9, 2025
Merged

Fix broken image integration tests. #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b329e8
Fix broken image integration tests.
jglogan Dec 9, 2025
f2f5d69
Re-enable port range forward test.
jglogan Dec 9, 2025
e0e6122
Rename no-parallel tests so they don't run as unit tests.
jglogan Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
$(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
echo Ensuring apiserver stopped after the CLI integration tests ; \
scripts/ensure-container-stopped.sh ; \
exit $${exit_code} ; \
Expand Down
85 changes: 0 additions & 85 deletions ...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
func doRemoveImages(images: [String]? = nil) throws {
var args = [
"image",
"rm",
]

if let images {
args.append(contentsOf: images)
} else {
args.append("--all")
}

let (_, _, error, status) = try run(arguments: args)
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}
}

func isImagePresent(targetImage: String) throws -> Bool {
let images = try doListImages()
return images.contains(where: { image in
if image.reference == targetImage {
return true
}
return false
})
}

func doListImages() throws -> [Image] {
let (_, output, error, status) = try run(arguments: [
"image",
"list",
"--format",
"json",
])
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}

guard let jsonData = output.data(using: .utf8) else {
throw CLIError.invalidOutput("image list output invalid \(output)")
}

let decoder = JSONDecoder()
return try decoder.decode([Image].self, from: jsonData)
}

func doImageTag(image: String, newName: String) throws {
let tagArgs = [
"image",
"tag",
image,
newName,
]

let (_, _, error, status) = try run(arguments: tagArgs)
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}
}

}

extension TestCLIImagesCommand {

@Test func testPull() throws {
do {
try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
"Expected validation error message in output")
}

@Test func testMaxConcurrentDownloadsFlag() throws {
// Test that the flag is accepted with valid values
do {
try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
let imagePresent = try isImagePresent(targetImage: alpine)
#expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

// Clean up
try? doRemoveImages(images: [alpine])

Comment on lines -385 to -387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.

We should probably add some unit tests at a different level. What do you think?

@jgloganjgloganDec 8, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).

// Test with higher concurrency
try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
let imagePresent2 = try isImagePresent(targetImage: alpine)
#expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
} catch {
Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
return
}
}

@Test func testImageSaveAndLoadStdinStdout() throws {
do {
// 1. pull image
Expand Down
6 changes: 4 additions & 2 deletions ...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
try #require(response.status == .ok)
success = true
print("request to \(url) succeeded")
} catch {
print("request to \(url) failed, error \(error)")
try await Task.sleep(for: .seconds(retryDelaySeconds))
}
retriesRemaining -= 1
}
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try doStop(name: name)
} catch {
Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
try #require(response.status == .ok)
success = true
print("request to \(url) succeeded")
} catch {
print("request to \(url) failed, error: \(error)")
try await Task.sleep(for: .seconds(retryDelaySeconds))
}
retriesRemaining -= 1
}
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try doStop(name: name)
} catch {
Issue.record("failed to run container \(error)")
Expand Down
49 changes: 49 additions & 0 deletions Tests/CLITests/TestCLINoParallelCases.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
@Test func testImageSingleConcurrentDownload() throws {
// removing this image during parallel tests breaks stuff!
_ = try? run(arguments: ["image", "rm", alpine])
do {
try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
let imagePresent = try isImagePresent(targetImage: alpine)
#expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
} catch {
Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
return
}
}

@Test func testImageManyConcurrentDownloads() throws {
// removing this image during parallel tests breaks stuff!
_ = try? run(arguments: ["image", "rm", alpine])
do {
try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
let imagePresent = try isImagePresent(targetImage: alpine)
#expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
} catch {
Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
return
}
}
}
61 changes: 61 additions & 0 deletions Tests/CLITests/Utilities/CLITest.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

return try await body(tempDir)
}

func doRemoveImages(images: [String]? = nil) throws {
var args = [
"image",
"rm",
]

if let images {
args.append(contentsOf: images)
} else {
args.append("--all")
}

let (_, _, error, status) = try run(arguments: args)
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}
}

func isImagePresent(targetImage: String) throws -> Bool {
let images = try doListImages()
return images.contains(where: { image in
if image.reference == targetImage {
return true
}
return false
})
}

func doListImages() throws -> [Image] {
let (_, output, error, status) = try run(arguments: [
"image",
"list",
"--format",
"json",
])
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}

guard let jsonData = output.data(using: .utf8) else {
throw CLIError.invalidOutput("image list output invalid \(output)")
}

let decoder = JSONDecoder()
return try decoder.decode([Image].self, from: jsonData)
}

func doImageTag(image: String, newName: String) throws {
let tagArgs = [
"image",
"tag",
image,
newName,
]

let (_, _, error, status) = try run(arguments: tagArgs)
if status != 0 {
throw CLIError.executionFailed("command failed: \(error)")
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix broken image integration tests.#944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jglogan
merged 3 commits into

from

Dec 9, 2025
 Merged


Fix broken image integration tests.
#944
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4b329e8

Fix broken image integration tests.


jglogan Dec 9, 2025
f2f5d69

Re-enable port range forward test.


jglogan Dec 9, 2025
e0e6122

Rename no-parallel tests so they don't run as unit tests.


jglogan Dec 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,7 @@ integration: init-block
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIKernelSet || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter TestCLIAnonymousVolumes || exit_code=1 ; \
 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --no-parallel --filter TestCLINoParallelCases || exit_code=1 ; \
 echo Ensuring apiserver stopped after the CLI integration tests ; \
 scripts/ensure-container-stopped.sh ; \
 exit $${exit_code} ; \
Expand Down

85 changes: 0 additions & 85 deletions
...ts/Subcommands/Images/TestCLIImages.swift → ...ommands/Images/TestCLIImagesCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,71 +20,6 @@ import Foundation
import Testing

class TestCLIImagesCommand: CLITest {
 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

}

extension TestCLIImagesCommand {

 @Test func testPull() throws {
 do {
 try doPull(imageName: alpine)
Expand DownExpand Up@@ -375,26 +310,6 @@ extension TestCLIImagesCommand {
 "Expected validation error message in output")
 }

 @Test func testMaxConcurrentDownloadsFlag() throws {
 // Test that the flag is accepted with valid values
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")

 // Clean up
 try? doRemoveImages(images: [alpine])


Comment on lines

-385
 to 
-387

@katiewasnotherekatiewasnothereDec 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're no longer guaranteeing that either of these images are not already pulled locally. And as it is right now, this test is not really validating that the value is respected, just that the command doesn't fail. If this test just cares about if the command can accept valid "max-concurrent-downloads" values, we can just try to pull the normal alpine image.
We should probably add some unit tests at a different level. What do you think?
@jgloganjgloganDec 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI, the are guaranteed to be pulled locally in this test as long as nobody pulls those same images (which is why I used the symbols I did).
 // Test with higher concurrency
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "6"])
 let imagePresent2 = try isImagePresent(targetImage: alpine)
 #expect(imagePresent2, "Expected image to be pulled with maxConcurrentDownloads=6")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageSaveAndLoadStdinStdout() throws {
 do {
 // 1. pull image
Expand Down

6 changes: 4 additions & 2 deletions
...s/Subcommands/Run/TestCLIRunOptions.swift → ...s/Subcommands/Run/TestCLIRunCommand.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -513,13 +513,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand DownExpand Up@@ -561,13 +562,14 @@ class TestCLIRunCommand: CLITest {
 let response = try await client.execute(request, timeout: .seconds(retryDelaySeconds))
 try #require(response.status == .ok)
 success = true
 print("request to \(url) succeeded")
 } catch {
 print("request to \(url) failed, error: \(error)")
 try await Task.sleep(for: .seconds(retryDelaySeconds))
 }
 retriesRemaining -= 1
 }
#expect(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
try #require(success, "Request to \(url) failed after \(retries - retriesRemaining) retries")
 try doStop(name: name)
 } catch {
 Issue.record("failed to run container \(error)")
Expand Down

49 changes: 49 additions & 0 deletions
Tests/CLITests/TestCLINoParallelCases.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
//===----------------------------------------------------------------------===//
// Copyright © 2025 Apple Inc. and the container project authors.
//
// 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 ContainerClient
import ContainerizationOCI
import Foundation
import Testing

/// Tests that need total control over environment to avoid conflicts.
class TestCLINoParallelCases: CLITest {
 @Test func testImageSingleConcurrentDownload() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "1"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=1")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }

 @Test func testImageManyConcurrentDownloads() throws {
 // removing this image during parallel tests breaks stuff!
 _ = try? run(arguments: ["image", "rm", alpine])
 do {
 try doPull(imageName: alpine, args: ["--max-concurrent-downloads", "64"])
 let imagePresent = try isImagePresent(targetImage: alpine)
 #expect(imagePresent, "Expected image to be pulled with maxConcurrentDownloads=64")
 } catch {
 Issue.record("failed to pull image with maxConcurrentDownloads flag: \(error)")
 return
 }
 }
}

61 changes: 61 additions & 0 deletions
Tests/CLITests/Utilities/CLITest.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,4 +484,65 @@ class CLITest {

 return try await body(tempDir)
 }

 func doRemoveImages(images: [String]? = nil) throws {
 var args = [
 "image",
 "rm",
 ]

 if let images {
 args.append(contentsOf: images)
 } else {
 args.append("--all")
 }

 let (_, _, error, status) = try run(arguments: args)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }

 func isImagePresent(targetImage: String) throws -> Bool {
 let images = try doListImages()
 return images.contains(where: { image in
 if image.reference == targetImage {
 return true
 }
 return false
 })
 }

 func doListImages() throws -> [Image] {
 let (_, output, error, status) = try run(arguments: [
 "image",
 "list",
 "--format",
 "json",
 ])
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }

 guard let jsonData = output.data(using: .utf8) else {
 throw CLIError.invalidOutput("image list output invalid \(output)")
 }

 let decoder = JSONDecoder()
 return try decoder.decode([Image].self, from: jsonData)
 }

 func doImageTag(image: String, newName: String) throws {
 let tagArgs = [
 "image",
 "tag",
 image,
 newName,
 ]

 let (_, _, error, status) = try run(arguments: tagArgs)
 if status != 0 {
 throw CLIError.executionFailed("command failed: \(error)")
 }
 }
}