Skip to content

Commit 42d8544

Browse files
authored
Merge pull request #189 from tahirmt/fix-unit-tests
Fix broken unit tests due to new logs and Xcode version
2 parents bfefa45 + 4073626 commit 42d8544

7 files changed

+19
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: CI
22
on: [push, pull_request]
33
jobs:
44
test:
5-
runs-on: macOS-10.15
5+
runs-on: macOS-11
66
steps:
77
- uses: actions/checkout@v3
88
- name: Run tests
99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_12.3.app
10+
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
1111
run: swift test

Tests/XcodesKitTests/Fixtures/LogOutput-AlternativeDirectory.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Apple ID:
22
Apple ID Password:
33

4+
Downloading with urlSession - for faster downloads install aria2 (`brew install aria2`)
5+
46
(1/6) Downloading Xcode 0.0.0: 1%
57
(1/6) Downloading Xcode 0.0.0: 2%
68
(1/6) Downloading Xcode 0.0.0: 3%
@@ -102,6 +104,7 @@ Apple ID Password:
102104
(1/6) Downloading Xcode 0.0.0: 99%
103105
(1/6) Downloading Xcode 0.0.0: 100%
104106
(2/6) Unarchiving Xcode (This can take a while)
107+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
105108
(3/6) Moving Xcode to /Users/brandon/Xcode/Xcode-0.0.0.app
106109
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
107110
(5/6) Checking security assessment and code signing

Tests/XcodesKitTests/Fixtures/LogOutput-DamagedXIP.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ Apple ID Password:
33

44
(1/6) Found existing archive that will be used for installation at /Users/brandon/Library/Application Support/com.robotsandpencils.xcodes/Xcode-0.0.0.xip.
55
(2/6) Unarchiving Xcode (This can take a while)
6+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
67
The archive "Xcode-0.0.0.xip" is damaged and can't be expanded.
78
Removing damaged XIP and re-attempting installation.
89

910

11+
Downloading with urlSession - for faster downloads install aria2 (`brew install aria2`)
12+
1013
(1/6) Downloading Xcode 0.0.0: 1%
1114
(1/6) Downloading Xcode 0.0.0: 2%
1215
(1/6) Downloading Xcode 0.0.0: 3%
@@ -108,6 +111,7 @@ Removing damaged XIP and re-attempting installation.
108111
(1/6) Downloading Xcode 0.0.0: 99%
109112
(1/6) Downloading Xcode 0.0.0: 100%
110113
(2/6) Unarchiving Xcode (This can take a while)
114+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
111115
(3/6) Moving Xcode to /Applications/Xcode-0.0.0.app
112116
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
113117
(5/6) Checking security assessment and code signing

Tests/XcodesKitTests/Fixtures/LogOutput-FullHappyPath-NoColor.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Apple ID:
22
Apple ID Password:
33

4+
Downloading with urlSession - for faster downloads install aria2 (`brew install aria2`)
5+
46
(1/6) Downloading Xcode 0.0.0: 1%
57
(1/6) Downloading Xcode 0.0.0: 2%
68
(1/6) Downloading Xcode 0.0.0: 3%
@@ -102,6 +104,7 @@ Apple ID Password:
102104
(1/6) Downloading Xcode 0.0.0: 99%
103105
(1/6) Downloading Xcode 0.0.0: 100%
104106
(2/6) Unarchiving Xcode (This can take a while)
107+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
105108
(3/6) Moving Xcode to /Applications/Xcode-0.0.0.app
106109
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
107110
(5/6) Checking security assessment and code signing

Tests/XcodesKitTests/Fixtures/LogOutput-FullHappyPath-NonInteractiveTerminal.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Apple ID:
22
Apple ID Password:
33
(1/6) Downloading Xcode 0.0.0
44
(2/6) Unarchiving Xcode (This can take a while)
5+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
56
(3/6) Moving Xcode to /Applications/Xcode-0.0.0.app
67
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
78
(5/6) Checking security assessment and code signing

Tests/XcodesKitTests/Fixtures/LogOutput-FullHappyPath.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Apple ID:
22
Apple ID Password:
33

4+
Downloading with urlSession - for faster downloads install aria2 (`brew install aria2`)
5+
46
(1/6) Downloading Xcode 0.0.0: 1%
57
(1/6) Downloading Xcode 0.0.0: 2%
68
(1/6) Downloading Xcode 0.0.0: 3%
@@ -102,6 +104,7 @@ Apple ID Password:
102104
(1/6) Downloading Xcode 0.0.0: 99%
103105
(1/6) Downloading Xcode 0.0.0: 100%
104106
(2/6) Unarchiving Xcode (This can take a while)
107+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
105108
(3/6) Moving Xcode to /Applications/Xcode-0.0.0.app
106109
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
107110
(5/6) Checking security assessment and code signing

Tests/XcodesKitTests/Fixtures/LogOutput-IncorrectSavedPassword.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Invalid username and password combination. Attempted to sign in with username te
33
Try entering your password again
44
Apple ID Password ([email protected]):
55

6+
Downloading with urlSession - for faster downloads install aria2 (`brew install aria2`)
7+
68
(1/6) Downloading Xcode 0.0.0: 1%
79
(1/6) Downloading Xcode 0.0.0: 2%
810
(1/6) Downloading Xcode 0.0.0: 3%
@@ -104,6 +106,7 @@ Apple ID Password ([email protected]):
104106
(1/6) Downloading Xcode 0.0.0: 99%
105107
(1/6) Downloading Xcode 0.0.0: 100%
106108
(2/6) Unarchiving Xcode (This can take a while)
109+
Using regular unxip. Try passing `--experimental-unxip` for a faster unxip process
107110
(3/6) Moving Xcode to /Applications/Xcode-0.0.0.app
108111
(4/6) Moving Xcode archive Xcode-0.0.0.xip to the Trash
109112
(5/6) Checking security assessment and code signing

0 commit comments

Comments
 (0)