appium-webdriveragent 5.15.2 → 5.15.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m +10 -0
- package/build/lib/utils.d.ts +8 -1
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +8 -1
- package/build/lib/utils.js.map +1 -1
- package/build/lib/xcodebuild.d.ts +2 -5
- package/build/lib/xcodebuild.d.ts.map +1 -1
- package/build/lib/xcodebuild.js +15 -50
- package/build/lib/xcodebuild.js.map +1 -1
- package/lib/utils.js +8 -1
- package/lib/xcodebuild.js +20 -52
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [5.15.4](https://github.com/appium/WebDriverAgent/compare/v5.15.3...v5.15.4) (2023-12-07)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* set appearance in iOS 17+ ([#818](https://github.com/appium/WebDriverAgent/issues/818)) ([357a2cb](https://github.com/appium/WebDriverAgent/commit/357a2cbca106daf42bc892b251802bfa00895598))
|
|
7
|
+
|
|
8
|
+
## [5.15.3](https://github.com/appium/WebDriverAgent/compare/v5.15.2...v5.15.3) (2023-11-24)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Miscellaneous Chores
|
|
12
|
+
|
|
13
|
+
* Make xcodebuild error message more helpful ([#816](https://github.com/appium/WebDriverAgent/issues/816)) ([2d7fc03](https://github.com/appium/WebDriverAgent/commit/2d7fc0370b30e5e3adc9a13002fa95f607c4c160))
|
|
14
|
+
|
|
1
15
|
## [5.15.2](https://github.com/appium/WebDriverAgent/compare/v5.15.1...v5.15.2) (2023-11-23)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -339,6 +339,16 @@ static bool fb_isLocked;
|
|
|
339
339
|
[invocation invoke];
|
|
340
340
|
return YES;
|
|
341
341
|
}
|
|
342
|
+
|
|
343
|
+
#if __clang_major__ >= 15 || (__clang_major__ >= 14 && __clang_minor__ >= 0 && __clang_patchlevel__ >= 3)
|
|
344
|
+
// Xcode 14.3.1 can build these values.
|
|
345
|
+
// For iOS 17+
|
|
346
|
+
if ([self respondsToSelector:NSSelectorFromString(@"appearance")]) {
|
|
347
|
+
self.appearance = (XCUIDeviceAppearance) appearance;
|
|
348
|
+
return YES;
|
|
349
|
+
}
|
|
350
|
+
#endif
|
|
351
|
+
|
|
342
352
|
return [[[FBErrorBuilder builder]
|
|
343
353
|
withDescriptionFormat:@"Current Xcode SDK does not support appearance changing"]
|
|
344
354
|
buildError:error];
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -81,7 +81,14 @@ export function setXctestrunFile(deviceInfo: DeviceInfo, sdkVersion: string, boo
|
|
|
81
81
|
* @returns {Promise<string>}
|
|
82
82
|
*/
|
|
83
83
|
export function getXctestrunFilePath(deviceInfo: DeviceInfo, sdkVersion: string, bootstrapPath: string): Promise<string>;
|
|
84
|
-
|
|
84
|
+
/**
|
|
85
|
+
* Ensures the process is killed after the timeout
|
|
86
|
+
*
|
|
87
|
+
* @param {string} name
|
|
88
|
+
* @param {import('teen_process').SubProcess} proc
|
|
89
|
+
* @returns {Promise<void>}
|
|
90
|
+
*/
|
|
91
|
+
export function killProcess(name: string, proc: import('teen_process').SubProcess): Promise<void>;
|
|
85
92
|
/**
|
|
86
93
|
* Generate a random integer.
|
|
87
94
|
*
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAmCA,oCAA8C;;;;;;;;kBA+HhC,MAAM;;;;UACN,MAAM;;;;qBACN,MAAM;;;;kBACN,MAAM;;AAtDpB;;;;;GAKG;AACH,6CAHW,MAAM,eACN,MAAM,iBAchB;AAED;;;GAGG;AACH,4CAFW,MAAM,iBAiBhB;AAED,+FAKC;AAqCD;;;;;GAKG;AACH,sDAJW,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,MAAM,CAajB;AA4CD;;;;;GAKG;AACH,iDAJW,UAAU,WACV,MAAM,GACL,MAAM,CAMjB;AA1GD;;;;;;;EAOE;AACF;;;;;;;;;;;;;;;;GAgBG;AACH,6CATW,UAAU,cACV,MAAM,iBACN,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,QAAQ,MAAM,CAAC,CAa1B;AAqBD;;;;;;GAMG;AACH,iDALW,UAAU,cACV,MAAM,iBACN,MAAM,GACJ,QAAQ,MAAM,CAAC,CAkC3B;AAeD,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAmCA,oCAA8C;;;;;;;;kBA+HhC,MAAM;;;;UACN,MAAM;;;;qBACN,MAAM;;;;kBACN,MAAM;;AAtDpB;;;;;GAKG;AACH,6CAHW,MAAM,eACN,MAAM,iBAchB;AAED;;;GAGG;AACH,4CAFW,MAAM,iBAiBhB;AAED,+FAKC;AAqCD;;;;;GAKG;AACH,sDAJW,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,MAAM,CAajB;AA4CD;;;;;GAKG;AACH,iDAJW,UAAU,WACV,MAAM,GACL,MAAM,CAMjB;AA1GD;;;;;;;EAOE;AACF;;;;;;;;;;;;;;;;GAgBG;AACH,6CATW,UAAU,cACV,MAAM,iBACN,MAAM,iBACN,MAAM,GAAC,MAAM,GACZ,QAAQ,MAAM,CAAC,CAa1B;AAqBD;;;;;;GAMG;AACH,iDALW,UAAU,cACV,MAAM,iBACN,MAAM,GACJ,QAAQ,MAAM,CAAC,CAkC3B;AAeD;;;;;;GAMG;AACH,kCAJW,MAAM,QACN,OAAO,cAAc,EAAE,UAAU,GAC/B,QAAQ,IAAI,CAAC,CA8BzB;AAED;;;;GAIG;AACH,gDAFY,MAAM,CAIjB;AAED;;;;;GAKG;AACH,0CAHY,QAAQ,MAAM,QAAE,CAU3B;AAED;;;;;GAKG;AACH,yCAHW,MAAM,eACN,OAAO,iBAWjB;AAED;;;;;;;;;;;;GAYG;AACH,6CARW,MAAM,GAAC,MAAM,oCAMX,QAAQ,MAAM,EAAE,CAAC,CAgC7B;AA9UD,sEAqCC;AAED;;;;GAIG;AACH,qCAHW,MAAM,GACJ,OAAO,CAInB"}
|
package/build/lib/utils.js
CHANGED
|
@@ -262,11 +262,18 @@ function getXctestrunFileName(deviceInfo, version) {
|
|
|
262
262
|
: `WebDriverAgentRunner_iphone${deviceInfo.isRealDevice ? `os${version}-arm64` : `simulator${version}-x86_64`}.xctestrun`;
|
|
263
263
|
}
|
|
264
264
|
exports.getXctestrunFileName = getXctestrunFileName;
|
|
265
|
+
/**
|
|
266
|
+
* Ensures the process is killed after the timeout
|
|
267
|
+
*
|
|
268
|
+
* @param {string} name
|
|
269
|
+
* @param {import('teen_process').SubProcess} proc
|
|
270
|
+
* @returns {Promise<void>}
|
|
271
|
+
*/
|
|
265
272
|
async function killProcess(name, proc) {
|
|
266
273
|
if (!proc || !proc.isRunning) {
|
|
267
274
|
return;
|
|
268
275
|
}
|
|
269
|
-
logger_1.default.info(`Shutting down '${name}' process (pid '${proc.proc
|
|
276
|
+
logger_1.default.info(`Shutting down '${name}' process (pid '${proc.proc?.pid}')`);
|
|
270
277
|
logger_1.default.info(`Sending 'SIGTERM'...`);
|
|
271
278
|
try {
|
|
272
279
|
await proc.stop('SIGTERM', 1000);
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ export class XcodeBuild {
|
|
|
7
7
|
* @param {import('@appium/types').AppiumLogger?} log
|
|
8
8
|
*/
|
|
9
9
|
constructor(xcodeVersion: string, device: any, args?: any, log?: import('@appium/types').AppiumLogger | null);
|
|
10
|
+
/** @type {SubProcess} */
|
|
11
|
+
xcodebuild: SubProcess;
|
|
10
12
|
xcodeVersion: string;
|
|
11
13
|
device: any;
|
|
12
14
|
log: import("@appium/types").AppiumLogger;
|
|
@@ -35,10 +37,6 @@ export class XcodeBuild {
|
|
|
35
37
|
allowProvisioningDeviceRegistration: any;
|
|
36
38
|
resultBundlePath: any;
|
|
37
39
|
resultBundleVersion: any;
|
|
38
|
-
/** @type {string} */
|
|
39
|
-
_logLocation: string;
|
|
40
|
-
/** @type {string[]} */
|
|
41
|
-
_wdaErrorMessage: string[];
|
|
42
40
|
_didBuildFail: boolean;
|
|
43
41
|
_didProcessExit: boolean;
|
|
44
42
|
init(noSessionProxy: any): Promise<void>;
|
|
@@ -48,7 +46,6 @@ export class XcodeBuild {
|
|
|
48
46
|
_derivedDataPathPromise: Promise<any> | undefined;
|
|
49
47
|
reset(): Promise<void>;
|
|
50
48
|
prebuild(): Promise<void>;
|
|
51
|
-
xcodebuild: SubProcess | null | undefined;
|
|
52
49
|
cleanProject(): Promise<void>;
|
|
53
50
|
getCommand(buildOnly?: boolean): {
|
|
54
51
|
cmd: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcodebuild.d.ts","sourceRoot":"","sources":["../../lib/xcodebuild.js"],"names":[],"mappings":";AAmCA;
|
|
1
|
+
{"version":3,"file":"xcodebuild.d.ts","sourceRoot":"","sources":["../../lib/xcodebuild.js"],"names":[],"mappings":";AAmCA;IAIE;;;;;OAKG;IACH,0BALW,MAAM,UACN,GAAG,SACH,GAAG,QACH,OAAO,eAAe,EAAE,YAAY,SAiD9C;IAxDD,yBAAyB;IACzB,YADW,UAAU,CACV;IAST,qBAAgC;IAEhC,YAAoB;IACpB,0CAA+B;IAE/B,gBAAiC;IAEjC,eAA+B;IAC/B,mBAAuC;IAEvC,qBAA2C;IAC3C,kBAAqC;IACrC,mBAAuC;IAEvC,kBAAqC;IAErC,qBAA2C;IAC3C,gBAAiC;IACjC,oBAA+D;IAC/D,kBAAqC;IACrC,sBAA6C;IAE7C,iBAAmC;IACnC,oBAAyC;IACzC,wBAAiD;IAEjD,sBAA6C;IAE7C,mBAAuC;IAEvC,mBAAuC;IAEvC,wBAAiD;IACjD,qBAA2C;IAE3C,qBAA2C;IAE3C,mBAAyF;IAEzF,yCAAmF;IAEnF,sBAA6C;IAC7C,yBAAmD;IAEnD,uBAA0B;IAC1B,yBAA4B;IAG9B,yCA0BC;IAzBC,oBAAoC;IASlC,sCAAuH;IAkB3H,wCAgCC;IAtBC,kDAoBI;IAIN,uBAKC;IAED,0BAUC;IAED,8BAYC;IAED;;;MAuEC;IAED,2DA2DC;IAED,yCA6CC;IApCK,oCAA0B;IAsChC,wCA0CC;IAzBS,cAAoC;IA2B9C,sBAEC;CACF;2BAhagC,cAAc"}
|
package/build/lib/xcodebuild.js
CHANGED
|
@@ -14,7 +14,6 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
14
14
|
const path_1 = __importDefault(require("path"));
|
|
15
15
|
const os_1 = require("os");
|
|
16
16
|
const constants_1 = require("./constants");
|
|
17
|
-
const node_readline_1 = __importDefault(require("node:readline"));
|
|
18
17
|
const DEFAULT_SIGNING_ID = 'iPhone Developer';
|
|
19
18
|
const PREBUILD_DELAY = 0;
|
|
20
19
|
const RUNNER_SCHEME_IOS = 'WebDriverAgentRunner';
|
|
@@ -65,10 +64,6 @@ class XcodeBuild {
|
|
|
65
64
|
this.allowProvisioningDeviceRegistration = args.allowProvisioningDeviceRegistration;
|
|
66
65
|
this.resultBundlePath = args.resultBundlePath;
|
|
67
66
|
this.resultBundleVersion = args.resultBundleVersion;
|
|
68
|
-
/** @type {string} */
|
|
69
|
-
this._logLocation = '';
|
|
70
|
-
/** @type {string[]} */
|
|
71
|
-
this._wdaErrorMessage = [];
|
|
72
67
|
this._didBuildFail = false;
|
|
73
68
|
this._didProcessExit = false;
|
|
74
69
|
}
|
|
@@ -139,7 +134,6 @@ class XcodeBuild {
|
|
|
139
134
|
this.log.debug('Pre-building WDA before launching test');
|
|
140
135
|
this.usePrebuiltWDA = true;
|
|
141
136
|
await this.start(true);
|
|
142
|
-
this.xcodebuild = null;
|
|
143
137
|
if (this.prebuildDelay > 0) {
|
|
144
138
|
// pause a moment
|
|
145
139
|
await bluebird_1.default.delay(this.prebuildDelay);
|
|
@@ -240,7 +234,6 @@ class XcodeBuild {
|
|
|
240
234
|
if (upgradeTimestamp) {
|
|
241
235
|
env.UPGRADE_TIMESTAMP = upgradeTimestamp;
|
|
242
236
|
}
|
|
243
|
-
this._logLocation = '';
|
|
244
237
|
this._didBuildFail = false;
|
|
245
238
|
const xcodebuild = new teen_process_1.SubProcess(cmd, args, {
|
|
246
239
|
cwd: this.bootstrapPath,
|
|
@@ -255,14 +248,6 @@ class XcodeBuild {
|
|
|
255
248
|
this.log.debug(`${logMsg}. To change this, use 'showXcodeLog' desired capability`);
|
|
256
249
|
xcodebuild.on('output', (stdout, stderr) => {
|
|
257
250
|
let out = stdout || stderr;
|
|
258
|
-
// we want to pull out the log file that is created, and highlight it
|
|
259
|
-
// for diagnostic purposes
|
|
260
|
-
if (out.includes('Writing diagnostic log for test session to')) {
|
|
261
|
-
// pull out the first line that begins with the path separator
|
|
262
|
-
// which *should* be the line indicating the log file generated
|
|
263
|
-
this._logLocation = lodash_1.default.first(lodash_1.default.remove(out.trim().split('\n'), (v) => v.startsWith(path_1.default.sep))) ?? '';
|
|
264
|
-
xcodeLog.debug(`Log file location for xcodebuild test: ${this._logLocation || 'unknown'}`);
|
|
265
|
-
}
|
|
266
251
|
// if we have an error we want to output the logs
|
|
267
252
|
// otherwise the failure is inscrutible
|
|
268
253
|
// but do not log permission errors from trying to write to attachments folder
|
|
@@ -276,9 +261,6 @@ class XcodeBuild {
|
|
|
276
261
|
if (logXcodeOutput && !ignoreError) {
|
|
277
262
|
for (const line of out.split(os_1.EOL)) {
|
|
278
263
|
xcodeLog.error(line);
|
|
279
|
-
if (line) {
|
|
280
|
-
this._wdaErrorMessage.push(line);
|
|
281
|
-
}
|
|
282
264
|
}
|
|
283
265
|
}
|
|
284
266
|
});
|
|
@@ -286,43 +268,27 @@ class XcodeBuild {
|
|
|
286
268
|
}
|
|
287
269
|
async start(buildOnly = false) {
|
|
288
270
|
this.xcodebuild = await this.createSubProcess(buildOnly);
|
|
289
|
-
// Store xcodebuild message
|
|
290
|
-
this._wdaErrorMessage = [];
|
|
291
271
|
// wrap the start procedure in a promise so that we can catch, and report,
|
|
292
272
|
// any startup errors that are thrown as events
|
|
293
273
|
return await new bluebird_1.default((resolve, reject) => {
|
|
294
|
-
|
|
295
|
-
this.xcodebuild.once('exit', async (code, signal) => {
|
|
274
|
+
this.xcodebuild.once('exit', (code, signal) => {
|
|
296
275
|
xcodeLog.error(`xcodebuild exited with code '${code}' and signal '${signal}'`);
|
|
297
|
-
this.xcodebuild
|
|
298
|
-
const xcodeErrorMessage = this._wdaErrorMessage.join('\n');
|
|
299
|
-
this._wdaErrorMessage = [];
|
|
300
|
-
// print out the xcodebuild file if users have asked for it
|
|
301
|
-
if (this.showXcodeLog && this._logLocation) {
|
|
302
|
-
xcodeLog.error(`Contents of xcodebuild log file '${this._logLocation}':`);
|
|
303
|
-
try {
|
|
304
|
-
const logFile = node_readline_1.default.createInterface({
|
|
305
|
-
input: support_1.fs.createReadStream(this._logLocation),
|
|
306
|
-
terminal: false
|
|
307
|
-
});
|
|
308
|
-
logFile.on('line', (line) => {
|
|
309
|
-
xcodeLog.error(line);
|
|
310
|
-
});
|
|
311
|
-
await new bluebird_1.default((_resolve) => {
|
|
312
|
-
logFile.once('close', () => {
|
|
313
|
-
logFile.removeAllListeners();
|
|
314
|
-
_resolve();
|
|
315
|
-
});
|
|
316
|
-
});
|
|
317
|
-
}
|
|
318
|
-
catch (err) {
|
|
319
|
-
xcodeLog.error(`Unable to access xcodebuild log file: '${err.message}'`);
|
|
320
|
-
}
|
|
321
|
-
}
|
|
276
|
+
this.xcodebuild.removeAllListeners();
|
|
322
277
|
this.didProcessExit = true;
|
|
323
278
|
if (this._didBuildFail || (!signal && code !== 0)) {
|
|
324
|
-
|
|
325
|
-
`
|
|
279
|
+
let errorMessage = `xcodebuild failed with code ${code}.` +
|
|
280
|
+
` This usually indicates an issue with the local Xcode setup or WebDriverAgent` +
|
|
281
|
+
` project configuration or the driver-to-platform version mismatch.`;
|
|
282
|
+
if (!this.showXcodeLog) {
|
|
283
|
+
errorMessage += ` Consider setting 'showXcodeLog' capability to true in` +
|
|
284
|
+
` order to check the Appium server log for build-related error messages.`;
|
|
285
|
+
}
|
|
286
|
+
else if (this.realDevice) {
|
|
287
|
+
errorMessage += ` Consider checking the WebDriverAgent configuration guide` +
|
|
288
|
+
` for real iOS devices at` +
|
|
289
|
+
` https://github.com/appium/appium-xcuitest-driver/blob/master/docs/real-device-config.md.`;
|
|
290
|
+
}
|
|
291
|
+
return reject(new Error(errorMessage));
|
|
326
292
|
}
|
|
327
293
|
// in the case of just building, the process will exit and that is our finish
|
|
328
294
|
if (buildOnly) {
|
|
@@ -332,7 +298,6 @@ class XcodeBuild {
|
|
|
332
298
|
return (async () => {
|
|
333
299
|
try {
|
|
334
300
|
const timer = new support_1.timing.Timer().start();
|
|
335
|
-
// @ts-ignore this.xcodebuild must be defined
|
|
336
301
|
await this.xcodebuild.start(true);
|
|
337
302
|
if (!buildOnly) {
|
|
338
303
|
let status = await this.waitForStart(timer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcodebuild.js","sourceRoot":"","sources":["../../lib/xcodebuild.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"xcodebuild.js","sourceRoot":"","sources":["../../lib/xcodebuild.js"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -265,12 +265,19 @@ function getXctestrunFileName (deviceInfo, version) {
|
|
|
265
265
|
: `WebDriverAgentRunner_iphone${deviceInfo.isRealDevice ? `os${version}-arm64` : `simulator${version}-x86_64`}.xctestrun`;
|
|
266
266
|
}
|
|
267
267
|
|
|
268
|
+
/**
|
|
269
|
+
* Ensures the process is killed after the timeout
|
|
270
|
+
*
|
|
271
|
+
* @param {string} name
|
|
272
|
+
* @param {import('teen_process').SubProcess} proc
|
|
273
|
+
* @returns {Promise<void>}
|
|
274
|
+
*/
|
|
268
275
|
async function killProcess (name, proc) {
|
|
269
276
|
if (!proc || !proc.isRunning) {
|
|
270
277
|
return;
|
|
271
278
|
}
|
|
272
279
|
|
|
273
|
-
log.info(`Shutting down '${name}' process (pid '${proc.proc
|
|
280
|
+
log.info(`Shutting down '${name}' process (pid '${proc.proc?.pid}')`);
|
|
274
281
|
|
|
275
282
|
log.info(`Sending 'SIGTERM'...`);
|
|
276
283
|
try {
|
package/lib/xcodebuild.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { retryInterval } from 'asyncbox';
|
|
2
2
|
import { SubProcess, exec } from 'teen_process';
|
|
3
|
-
import {
|
|
3
|
+
import { logger, timing } from '@appium/support';
|
|
4
4
|
import defaultLogger from './logger';
|
|
5
5
|
import B from 'bluebird';
|
|
6
6
|
import {
|
|
7
7
|
setRealDeviceSecurity, setXctestrunFile,
|
|
8
8
|
updateProjectFile, resetProjectFile, killProcess,
|
|
9
|
-
getWDAUpgradeTimestamp, isTvOS
|
|
9
|
+
getWDAUpgradeTimestamp, isTvOS
|
|
10
|
+
} from './utils';
|
|
10
11
|
import _ from 'lodash';
|
|
11
12
|
import path from 'path';
|
|
12
13
|
import { EOL } from 'os';
|
|
13
14
|
import { WDA_RUNNER_BUNDLE_ID } from './constants';
|
|
14
|
-
import readline from 'node:readline';
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
const DEFAULT_SIGNING_ID = 'iPhone Developer';
|
|
@@ -34,6 +34,9 @@ const xcodeLog = logger.getLogger('Xcode');
|
|
|
34
34
|
|
|
35
35
|
|
|
36
36
|
class XcodeBuild {
|
|
37
|
+
/** @type {SubProcess} */
|
|
38
|
+
xcodebuild;
|
|
39
|
+
|
|
37
40
|
/**
|
|
38
41
|
* @param {string} xcodeVersion
|
|
39
42
|
* @param {any} device
|
|
@@ -85,10 +88,6 @@ class XcodeBuild {
|
|
|
85
88
|
this.resultBundlePath = args.resultBundlePath;
|
|
86
89
|
this.resultBundleVersion = args.resultBundleVersion;
|
|
87
90
|
|
|
88
|
-
/** @type {string} */
|
|
89
|
-
this._logLocation = '';
|
|
90
|
-
/** @type {string[]} */
|
|
91
|
-
this._wdaErrorMessage = [];
|
|
92
91
|
this._didBuildFail = false;
|
|
93
92
|
this._didProcessExit = false;
|
|
94
93
|
}
|
|
@@ -168,8 +167,6 @@ class XcodeBuild {
|
|
|
168
167
|
this.usePrebuiltWDA = true;
|
|
169
168
|
await this.start(true);
|
|
170
169
|
|
|
171
|
-
this.xcodebuild = null;
|
|
172
|
-
|
|
173
170
|
if (this.prebuildDelay > 0) {
|
|
174
171
|
// pause a moment
|
|
175
172
|
await B.delay(this.prebuildDelay);
|
|
@@ -286,7 +283,6 @@ class XcodeBuild {
|
|
|
286
283
|
if (upgradeTimestamp) {
|
|
287
284
|
env.UPGRADE_TIMESTAMP = upgradeTimestamp;
|
|
288
285
|
}
|
|
289
|
-
this._logLocation = '';
|
|
290
286
|
this._didBuildFail = false;
|
|
291
287
|
const xcodebuild = new SubProcess(cmd, args, {
|
|
292
288
|
cwd: this.bootstrapPath,
|
|
@@ -302,14 +298,6 @@ class XcodeBuild {
|
|
|
302
298
|
this.log.debug(`${logMsg}. To change this, use 'showXcodeLog' desired capability`);
|
|
303
299
|
xcodebuild.on('output', (stdout, stderr) => {
|
|
304
300
|
let out = stdout || stderr;
|
|
305
|
-
// we want to pull out the log file that is created, and highlight it
|
|
306
|
-
// for diagnostic purposes
|
|
307
|
-
if (out.includes('Writing diagnostic log for test session to')) {
|
|
308
|
-
// pull out the first line that begins with the path separator
|
|
309
|
-
// which *should* be the line indicating the log file generated
|
|
310
|
-
this._logLocation = _.first(_.remove(out.trim().split('\n'), (v) => v.startsWith(path.sep))) ?? '';
|
|
311
|
-
xcodeLog.debug(`Log file location for xcodebuild test: ${this._logLocation || 'unknown'}`);
|
|
312
|
-
}
|
|
313
301
|
|
|
314
302
|
// if we have an error we want to output the logs
|
|
315
303
|
// otherwise the failure is inscrutible
|
|
@@ -326,9 +314,6 @@ class XcodeBuild {
|
|
|
326
314
|
if (logXcodeOutput && !ignoreError) {
|
|
327
315
|
for (const line of out.split(EOL)) {
|
|
328
316
|
xcodeLog.error(line);
|
|
329
|
-
if (line) {
|
|
330
|
-
this._wdaErrorMessage.push(line);
|
|
331
|
-
}
|
|
332
317
|
}
|
|
333
318
|
}
|
|
334
319
|
});
|
|
@@ -338,43 +323,27 @@ class XcodeBuild {
|
|
|
338
323
|
|
|
339
324
|
async start (buildOnly = false) {
|
|
340
325
|
this.xcodebuild = await this.createSubProcess(buildOnly);
|
|
341
|
-
// Store xcodebuild message
|
|
342
|
-
this._wdaErrorMessage = [];
|
|
343
326
|
|
|
344
327
|
// wrap the start procedure in a promise so that we can catch, and report,
|
|
345
328
|
// any startup errors that are thrown as events
|
|
346
329
|
return await new B((resolve, reject) => {
|
|
347
|
-
|
|
348
|
-
this.xcodebuild.once('exit', async (code, signal) => {
|
|
330
|
+
this.xcodebuild.once('exit', (code, signal) => {
|
|
349
331
|
xcodeLog.error(`xcodebuild exited with code '${code}' and signal '${signal}'`);
|
|
350
|
-
this.xcodebuild
|
|
351
|
-
const xcodeErrorMessage = this._wdaErrorMessage.join('\n');
|
|
352
|
-
this._wdaErrorMessage = [];
|
|
353
|
-
// print out the xcodebuild file if users have asked for it
|
|
354
|
-
if (this.showXcodeLog && this._logLocation) {
|
|
355
|
-
xcodeLog.error(`Contents of xcodebuild log file '${this._logLocation}':`);
|
|
356
|
-
try {
|
|
357
|
-
const logFile = readline.createInterface({
|
|
358
|
-
input: fs.createReadStream(this._logLocation),
|
|
359
|
-
terminal: false
|
|
360
|
-
});
|
|
361
|
-
logFile.on('line', (line) => {
|
|
362
|
-
xcodeLog.error(line);
|
|
363
|
-
});
|
|
364
|
-
await new B((_resolve) => {
|
|
365
|
-
logFile.once('close', () => {
|
|
366
|
-
logFile.removeAllListeners();
|
|
367
|
-
_resolve();
|
|
368
|
-
});
|
|
369
|
-
});
|
|
370
|
-
} catch (err) {
|
|
371
|
-
xcodeLog.error(`Unable to access xcodebuild log file: '${err.message}'`);
|
|
372
|
-
}
|
|
373
|
-
}
|
|
332
|
+
this.xcodebuild.removeAllListeners();
|
|
374
333
|
this.didProcessExit = true;
|
|
375
334
|
if (this._didBuildFail || (!signal && code !== 0)) {
|
|
376
|
-
|
|
377
|
-
`
|
|
335
|
+
let errorMessage = `xcodebuild failed with code ${code}.` +
|
|
336
|
+
` This usually indicates an issue with the local Xcode setup or WebDriverAgent` +
|
|
337
|
+
` project configuration or the driver-to-platform version mismatch.`;
|
|
338
|
+
if (!this.showXcodeLog) {
|
|
339
|
+
errorMessage += ` Consider setting 'showXcodeLog' capability to true in` +
|
|
340
|
+
` order to check the Appium server log for build-related error messages.`;
|
|
341
|
+
} else if (this.realDevice) {
|
|
342
|
+
errorMessage += ` Consider checking the WebDriverAgent configuration guide` +
|
|
343
|
+
` for real iOS devices at` +
|
|
344
|
+
` https://github.com/appium/appium-xcuitest-driver/blob/master/docs/real-device-config.md.`;
|
|
345
|
+
}
|
|
346
|
+
return reject(new Error(errorMessage));
|
|
378
347
|
}
|
|
379
348
|
// in the case of just building, the process will exit and that is our finish
|
|
380
349
|
if (buildOnly) {
|
|
@@ -385,7 +354,6 @@ class XcodeBuild {
|
|
|
385
354
|
return (async () => {
|
|
386
355
|
try {
|
|
387
356
|
const timer = new timing.Timer().start();
|
|
388
|
-
// @ts-ignore this.xcodebuild must be defined
|
|
389
357
|
await this.xcodebuild.start(true);
|
|
390
358
|
if (!buildOnly) {
|
|
391
359
|
let status = await this.waitForStart(timer);
|