From 5653b9457d15b43b92cc6568d938fc30654cf681 Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Sat, 18 Feb 2023 11:39:53 -0800 Subject: [PATCH 1/2] Made testStartingContainerAndRetrievingLogs() slightly more lenient so that it succeeds on Apple Silicon machines using ARM Docker image. --- Tests/DockerClientTests/ContainerTests.swift | 35 ++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/Tests/DockerClientTests/ContainerTests.swift b/Tests/DockerClientTests/ContainerTests.swift index 703927b..a50ecd7 100644 --- a/Tests/DockerClientTests/ContainerTests.swift +++ b/Tests/DockerClientTests/ContainerTests.swift @@ -45,18 +45,24 @@ final class ContainerTests: XCTestCase { let container = try client.containers.createContainer(image: image).wait() try container.start(on: client).wait() let output = try container.logs(on: client).wait() - - XCTAssertEqual( - output, - """ - + // Depending on CPU architecture, step 2 of the log output may by: + // 2. The Docker daemon pulled the "hello-world" image from the Docker Hub. + // (amd64) + // or + // 2. The Docker daemon pulled the "hello-world" image from the Docker Hub. + // (arm64v8) + // + // Just check the lines before and after this line + let expectedOutputPrefix = """ + Hello from Docker! This message shows that your installation appears to be working correctly. To generate this message, Docker took the following steps: 1. The Docker client contacted the Docker daemon. 2. The Docker daemon pulled the "hello-world" image from the Docker Hub. - (amd64) + """ + let expectedOutputSuffix = """ 3. The Docker daemon created a new container from that image which runs the executable that produces the output you are currently reading. 4. The Docker daemon streamed that output to the Docker client, which sent it @@ -72,6 +78,23 @@ final class ContainerTests: XCTestCase { https://docs.docker.com/get-started/ """ + + + XCTAssertTrue( + output.hasPrefix(expectedOutputPrefix), + """ + "\(output)" + did not start with + "\(expectedOutputPrefix)" + """ + ) + XCTAssertTrue( + output.hasSuffix(expectedOutputSuffix), + """ + "\(output)" + did not end with + "\(expectedOutputSuffix)" + """ ) } From b5b125895b315724cfdfd3373e395b03be45db35 Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Sun, 19 Feb 2023 12:03:00 -0800 Subject: [PATCH 2/2] Xcode reindent code. --- Tests/DockerClientTests/ContainerTests.swift | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Tests/DockerClientTests/ContainerTests.swift b/Tests/DockerClientTests/ContainerTests.swift index a50ecd7..998387a 100644 --- a/Tests/DockerClientTests/ContainerTests.swift +++ b/Tests/DockerClientTests/ContainerTests.swift @@ -17,7 +17,7 @@ final class ContainerTests: XCTestCase { func testCreateContainers() throws { let image = try client.images.pullImage(byName: "hello-world", tag: "latest").wait() let container = try client.containers.createContainer(image: image).wait() - + XCTAssertEqual(container.command, "/hello") } @@ -26,7 +26,7 @@ final class ContainerTests: XCTestCase { let _ = try client.containers.createContainer(image: image).wait() let containers = try client.containers.list(all: true).wait() - + XCTAssert(containers.count >= 1) } @@ -57,7 +57,7 @@ final class ContainerTests: XCTestCase { Hello from Docker! This message shows that your installation appears to be working correctly. - + To generate this message, Docker took the following steps: 1. The Docker client contacted the Docker daemon. 2. The Docker daemon pulled the "hello-world" image from the Docker Hub. @@ -67,18 +67,17 @@ final class ContainerTests: XCTestCase { executable that produces the output you are currently reading. 4. The Docker daemon streamed that output to the Docker client, which sent it to your terminal. - + To try something more ambitious, you can run an Ubuntu container with: $ docker run -it ubuntu bash - + Share images, automate workflows, and more with a free Docker ID: https://hub.docker.com/ - + For more examples and ideas, visit: https://docs.docker.com/get-started/ - + """ - XCTAssertTrue( output.hasPrefix(expectedOutputPrefix),