creevey 0.10.20 → 0.10.22
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/dist/server/master/pool.js +2 -2
- package/dist/server/master/pool.js.map +1 -1
- package/dist/server/master/runner.js +3 -2
- package/dist/server/master/runner.js.map +1 -1
- package/dist/server/reporters/teamcity.d.ts +0 -1
- package/dist/server/reporters/teamcity.js +22 -15
- package/dist/server/reporters/teamcity.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/src/server/master/pool.ts +3 -3
- package/src/server/master/runner.ts +9 -3
- package/src/server/reporters/teamcity.ts +24 -18
- package/src/types.ts +1 -0
|
@@ -65,7 +65,7 @@ class Pool extends events_1.EventEmitter {
|
|
|
65
65
|
worker.isRunning = true;
|
|
66
66
|
const { id } = test;
|
|
67
67
|
this.queue.shift();
|
|
68
|
-
this.sendStatus({ id, status: 'running' });
|
|
68
|
+
this.sendStatus({ id, workerId: worker.id, status: 'running' });
|
|
69
69
|
this.subscribe(worker, test);
|
|
70
70
|
(0, messages_js_1.sendTestMessage)(worker, { type: 'start', payload: test });
|
|
71
71
|
setImmediate(() => {
|
|
@@ -107,7 +107,7 @@ class Pool extends events_1.EventEmitter {
|
|
|
107
107
|
test.retries += 1;
|
|
108
108
|
this.queue[this.failFast ? 'unshift' : 'push'](test);
|
|
109
109
|
}
|
|
110
|
-
this.sendStatus({ id: test.id, status: shouldRetry ? 'retrying' : result.status, result });
|
|
110
|
+
this.sendStatus({ id: test.id, workerId: worker.id, status: shouldRetry ? 'retrying' : result.status, result });
|
|
111
111
|
worker.isRunning = false;
|
|
112
112
|
setImmediate(() => {
|
|
113
113
|
this.process();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAClD,mCAAsC;AAEtC,gDAAoE;AACpE,0CAA6D;AAS7D,MAAqB,IAAK,SAAQ,qBAAY;IAanC;IAEC;IAdF,UAAU,CAAS;IACnB,MAAM,CAAsB;IAC5B,OAAO,GAAa,EAAE,CAAC;IACvB,KAAK,GAAiB,EAAE,CAAC;IACzB,UAAU,GAAG,KAAK,CAAC;IACnB,QAAQ,CAAU;IAClB,OAAO,CAAU;IACjB,YAAY,CAAS;IAC7B,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACzD,CAAC;IACD,YACS,SAAsB,EAC7B,MAAc,EACN,OAAe,EACvB,OAAgB;QAEhB,KAAK,EAAE,CAAC;QALD,cAAS,GAAT,SAAS,CAAa;QAErB,YAAO,GAAP,OAAO,CAAQ;QAKvB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAwB,CAAC;QAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC;QAC9C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CACxC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CACzE,CACF,CACF,CAAC,MAAM,CAAC,CAAC,aAAa,EAA2B,EAAE,CAAC,aAAa,YAAY,gBAAa,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ;YACjC,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAuC;QAC3C,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAEjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACL,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC9E,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;YAAE,OAAO;QAE7B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QAExB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ class Runner extends events_1.EventEmitter {
|
|
|
48
48
|
.map((pool) => pool.on('test', this.handlePoolMessage));
|
|
49
49
|
}
|
|
50
50
|
handlePoolMessage = (message) => {
|
|
51
|
-
const { id, status, result } = message;
|
|
51
|
+
const { id, workerId, status, result } = message;
|
|
52
52
|
const test = this.testsManager.getTest(id);
|
|
53
53
|
if (!test)
|
|
54
54
|
return;
|
|
@@ -69,9 +69,10 @@ class Runner extends events_1.EventEmitter {
|
|
|
69
69
|
slow: () => 1000,
|
|
70
70
|
err: result?.error,
|
|
71
71
|
creevey: {
|
|
72
|
+
testId: id,
|
|
73
|
+
workerId,
|
|
72
74
|
sessionId: result?.sessionId ?? id,
|
|
73
75
|
browserName: result?.browserName ?? browser,
|
|
74
|
-
workerId: result?.workerId ?? process.pid,
|
|
75
76
|
willRetry: (result?.retries ?? 0) < this.config.maxRetries,
|
|
76
77
|
images: result?.images ?? {},
|
|
77
78
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":";;;;;AAAA,mCAAsC;AACtC,6CAYwB;AACxB,wDAA6B;AAC7B,yCAAyC;AACzC,0CAA0C;AAC1C,oDAAoD;AAGpD,mFAAmF;AACnF,IAAI,OAAO,GAAG,KAAK,CAAC;AAEpB,MAAM,UAAW,SAAQ,qBAAY;IAC5B,KAAK,GAAG;QACb,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;KACX,CAAC;CACH;AAED,MAAqB,MAAO,SAAQ,qBAAY;IACtC,QAAQ,CAAU;IAClB,QAAQ,CAAW;IACnB,SAAS,CAAc;IACvB,KAAK,GAAyB,EAAE,CAAC;IACjC,UAAU,CAAa;IACvB,MAAM,CAAS;IAChB,YAAY,CAAe;IAElC,IAAW,SAAS;QAClB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;IAED,YAAY,MAAc,EAAE,YAA0B,EAAE,OAAgB;QACtE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAA,sBAAW,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,QAAQ,CAAC,IAAI,IAAI,oBAAoB,EAAE,CAAC;YAC1C,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QAC/F,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QAEzB,IAAI,CAAC,QAAQ;aACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,iBAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aAC5F,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEO,iBAAiB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/server/master/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,29 +4,38 @@ exports.TeamcityReporter = void 0;
|
|
|
4
4
|
const types_js_1 = require("../../types.js");
|
|
5
5
|
class TeamcityReporter {
|
|
6
6
|
constructor(runner, options) {
|
|
7
|
-
const { reportDir
|
|
7
|
+
const { reportDir } = options;
|
|
8
8
|
console.log("##teamcity[testRetrySupport enabled='true']");
|
|
9
|
-
runner.on(types_js_1.TEST_EVENTS.RUN_BEGIN, () => {
|
|
10
|
-
console.log(`##teamcity[flowStarted flowId='${process.pid}']`);
|
|
11
|
-
console.log(`##teamcity[testSuiteStarted name='${this.escape(topLevelSuite)}' flowId='${process.pid}']`);
|
|
12
|
-
});
|
|
13
9
|
runner.on(types_js_1.TEST_EVENTS.TEST_BEGIN, (test) => {
|
|
14
10
|
const flowId = test.creevey.workerId;
|
|
15
|
-
const testName =
|
|
16
|
-
|
|
11
|
+
const [testName, ...testPath] = test
|
|
12
|
+
.titlePath()
|
|
13
|
+
.map((title) => this.escape(title))
|
|
14
|
+
.reverse();
|
|
15
|
+
for (const title of testPath.reverse()) {
|
|
16
|
+
console.log(`##teamcity[testSuiteStarted name='${title}' flowId='${flowId}']`);
|
|
17
|
+
}
|
|
17
18
|
console.log(`##teamcity[testStarted name='${testName}' flowId='${flowId}']`);
|
|
18
19
|
});
|
|
19
20
|
runner.on(types_js_1.TEST_EVENTS.TEST_PASS, (test) => {
|
|
20
21
|
const flowId = test.creevey.workerId;
|
|
21
|
-
const testName =
|
|
22
|
+
const [testName, ...testPath] = test
|
|
23
|
+
.titlePath()
|
|
24
|
+
.map((title) => this.escape(title))
|
|
25
|
+
.reverse();
|
|
22
26
|
const duration = test.duration ?? 0;
|
|
23
27
|
console.log(`##teamcity[testFinished name='${testName}' flowId='${flowId}' duration='${duration}']`);
|
|
24
|
-
|
|
28
|
+
for (const title of testPath.reverse()) {
|
|
29
|
+
console.log(`##teamcity[testSuiteFinished name='${title}' flowId='${flowId}']`);
|
|
30
|
+
}
|
|
25
31
|
});
|
|
26
32
|
runner.on(types_js_1.TEST_EVENTS.TEST_FAIL, (test, error) => {
|
|
27
33
|
const flowId = test.creevey.workerId;
|
|
28
34
|
const duration = test.duration ?? 0;
|
|
29
|
-
const testName =
|
|
35
|
+
const [testName, ...testPath] = test
|
|
36
|
+
.titlePath()
|
|
37
|
+
.map((title) => this.escape(title))
|
|
38
|
+
.reverse();
|
|
30
39
|
const browserName = this.escape(test.creevey.browserName);
|
|
31
40
|
const messageStr = error instanceof Error ? error.message : String(error);
|
|
32
41
|
const detailsStr = error instanceof Error ? (error.stack ?? '') : '';
|
|
@@ -49,11 +58,9 @@ class TeamcityReporter {
|
|
|
49
58
|
});
|
|
50
59
|
console.log(`##teamcity[testFailed name='${testName}' message='${this.escape(messageStr)}' details='${this.escape(detailsStr)}' flowId='${flowId}' duration='${duration}']`);
|
|
51
60
|
console.log(`##teamcity[testFinished name='${testName}' flowId='${flowId}' duration='${duration}']`);
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
console.log(`##teamcity[testSuiteFinished name='${this.escape(topLevelSuite)}' flowId='${process.pid}']`);
|
|
56
|
-
console.log(`##teamcity[flowFinished flowId='${process.pid}']`);
|
|
61
|
+
for (const title of testPath.reverse()) {
|
|
62
|
+
console.log(`##teamcity[testSuiteFinished name='${title}' flowId='${flowId}']`);
|
|
63
|
+
}
|
|
57
64
|
});
|
|
58
65
|
}
|
|
59
66
|
escape = (str) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"teamcity.js","sourceRoot":"","sources":["../../../src/server/reporters/teamcity.ts"],"names":[],"mappings":";;;AAAA,6CAA0E;AAG1E,MAAa,gBAAgB;IAC3B,YAAY,MAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"teamcity.js","sourceRoot":"","sources":["../../../src/server/reporters/teamcity.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -90,7 +90,7 @@ export default class Pool extends EventEmitter {
|
|
|
90
90
|
const { id } = test;
|
|
91
91
|
|
|
92
92
|
this.queue.shift();
|
|
93
|
-
this.sendStatus({ id, status: 'running' });
|
|
93
|
+
this.sendStatus({ id, workerId: worker.id, status: 'running' });
|
|
94
94
|
|
|
95
95
|
this.subscribe(worker, test);
|
|
96
96
|
|
|
@@ -101,7 +101,7 @@ export default class Pool extends EventEmitter {
|
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
private sendStatus(message: { id: string; status: TestStatus; result?: TestResult }): void {
|
|
104
|
+
private sendStatus(message: { id: string; workerId: number; status: TestStatus; result?: TestResult }): void {
|
|
105
105
|
this.emit('test', message);
|
|
106
106
|
}
|
|
107
107
|
|
|
@@ -147,7 +147,7 @@ export default class Pool extends EventEmitter {
|
|
|
147
147
|
this.queue[this.failFast ? 'unshift' : 'push'](test);
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
-
this.sendStatus({ id: test.id, status: shouldRetry ? 'retrying' : result.status, result });
|
|
150
|
+
this.sendStatus({ id: test.id, workerId: worker.id, status: shouldRetry ? 'retrying' : result.status, result });
|
|
151
151
|
|
|
152
152
|
worker.isRunning = false;
|
|
153
153
|
|
|
@@ -66,8 +66,13 @@ export default class Runner extends EventEmitter {
|
|
|
66
66
|
.map((pool) => pool.on('test', this.handlePoolMessage));
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
private handlePoolMessage = (message: {
|
|
70
|
-
|
|
69
|
+
private handlePoolMessage = (message: {
|
|
70
|
+
id: string;
|
|
71
|
+
workerId: number;
|
|
72
|
+
status: TestStatus;
|
|
73
|
+
result?: TestResult;
|
|
74
|
+
}): void => {
|
|
75
|
+
const { id, workerId, status, result } = message;
|
|
71
76
|
const test = this.testsManager.getTest(id);
|
|
72
77
|
|
|
73
78
|
if (!test) return;
|
|
@@ -90,9 +95,10 @@ export default class Runner extends EventEmitter {
|
|
|
90
95
|
slow: () => 1000,
|
|
91
96
|
err: result?.error,
|
|
92
97
|
creevey: {
|
|
98
|
+
testId: id,
|
|
99
|
+
workerId,
|
|
93
100
|
sessionId: result?.sessionId ?? id,
|
|
94
101
|
browserName: result?.browserName ?? browser,
|
|
95
|
-
workerId: result?.workerId ?? process.pid,
|
|
96
102
|
willRetry: (result?.retries ?? 0) < this.config.maxRetries,
|
|
97
103
|
images: result?.images ?? {},
|
|
98
104
|
},
|
|
@@ -2,35 +2,44 @@ import { FakeTest, Images, isDefined, TEST_EVENTS } from '../../types.js';
|
|
|
2
2
|
import EventEmitter from 'events';
|
|
3
3
|
|
|
4
4
|
export class TeamcityReporter {
|
|
5
|
-
constructor(runner: EventEmitter, options: { reportDir: string
|
|
6
|
-
const { reportDir
|
|
5
|
+
constructor(runner: EventEmitter, options: { reportDir: string }) {
|
|
6
|
+
const { reportDir } = options;
|
|
7
7
|
|
|
8
8
|
console.log("##teamcity[testRetrySupport enabled='true']");
|
|
9
9
|
|
|
10
|
-
runner.on(TEST_EVENTS.RUN_BEGIN, () => {
|
|
11
|
-
console.log(`##teamcity[flowStarted flowId='${process.pid}']`);
|
|
12
|
-
console.log(`##teamcity[testSuiteStarted name='${this.escape(topLevelSuite)}' flowId='${process.pid}']`);
|
|
13
|
-
});
|
|
14
|
-
|
|
15
10
|
runner.on(TEST_EVENTS.TEST_BEGIN, (test: FakeTest) => {
|
|
16
11
|
const flowId = test.creevey.workerId;
|
|
17
|
-
const testName =
|
|
18
|
-
|
|
12
|
+
const [testName, ...testPath] = test
|
|
13
|
+
.titlePath()
|
|
14
|
+
.map((title: string) => this.escape(title))
|
|
15
|
+
.reverse();
|
|
16
|
+
|
|
17
|
+
for (const title of testPath.reverse()) {
|
|
18
|
+
console.log(`##teamcity[testSuiteStarted name='${title}' flowId='${flowId}']`);
|
|
19
|
+
}
|
|
19
20
|
console.log(`##teamcity[testStarted name='${testName}' flowId='${flowId}']`);
|
|
20
21
|
});
|
|
21
22
|
|
|
22
23
|
runner.on(TEST_EVENTS.TEST_PASS, (test: FakeTest) => {
|
|
23
24
|
const flowId = test.creevey.workerId;
|
|
24
|
-
const testName =
|
|
25
|
+
const [testName, ...testPath] = test
|
|
26
|
+
.titlePath()
|
|
27
|
+
.map((title: string) => this.escape(title))
|
|
28
|
+
.reverse();
|
|
25
29
|
const duration = test.duration ?? 0;
|
|
26
30
|
console.log(`##teamcity[testFinished name='${testName}' flowId='${flowId}' duration='${duration}']`);
|
|
27
|
-
|
|
31
|
+
for (const title of testPath.reverse()) {
|
|
32
|
+
console.log(`##teamcity[testSuiteFinished name='${title}' flowId='${flowId}']`);
|
|
33
|
+
}
|
|
28
34
|
});
|
|
29
35
|
|
|
30
36
|
runner.on(TEST_EVENTS.TEST_FAIL, (test: FakeTest, error: Error) => {
|
|
31
37
|
const flowId = test.creevey.workerId;
|
|
32
38
|
const duration = test.duration ?? 0;
|
|
33
|
-
const testName =
|
|
39
|
+
const [testName, ...testPath] = test
|
|
40
|
+
.titlePath()
|
|
41
|
+
.map((title: string) => this.escape(title))
|
|
42
|
+
.reverse();
|
|
34
43
|
const browserName = this.escape(test.creevey.browserName);
|
|
35
44
|
const messageStr = error instanceof Error ? error.message : String(error);
|
|
36
45
|
const detailsStr = error instanceof Error ? (error.stack ?? '') : '';
|
|
@@ -60,12 +69,9 @@ export class TeamcityReporter {
|
|
|
60
69
|
)}' details='${this.escape(detailsStr)}' flowId='${flowId}' duration='${duration}']`,
|
|
61
70
|
);
|
|
62
71
|
console.log(`##teamcity[testFinished name='${testName}' flowId='${flowId}' duration='${duration}']`);
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
runner.on(TEST_EVENTS.RUN_END, () => {
|
|
67
|
-
console.log(`##teamcity[testSuiteFinished name='${this.escape(topLevelSuite)}' flowId='${process.pid}']`);
|
|
68
|
-
console.log(`##teamcity[flowFinished flowId='${process.pid}']`);
|
|
72
|
+
for (const title of testPath.reverse()) {
|
|
73
|
+
console.log(`##teamcity[testSuiteFinished name='${title}' flowId='${flowId}']`);
|
|
74
|
+
}
|
|
69
75
|
});
|
|
70
76
|
}
|
|
71
77
|
|