Skip to content
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

Fixed issue #192: When the launchId parameter is specified, all child processes would hang until the entire test set execution was completed. #194

Merged
merged 6 commits into from
Jun 20, 2024
Merged

Fixed issue #192: When the launchId parameter is specified, all child processes would hang until the entire test set execution was completed. #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
408f55c
#192. The code stopper for killing the processes after completing the…
epam-avramenko Jun 19, 2024
769c9dc
#192. The process for completing launches has been altered for both c…
epam-avramenko Jun 19, 2024
9623cfa
#192. The process for completing launches has been altered for both c…
epam-avramenko Jun 19, 2024
b99158d
#192. Eslint fix.
epam-avramenko Jun 20, 2024
639b831
#192. The process for completing launches has been altered for both c…
epam-avramenko Jun 20, 2024
39f9af4
#192. Fix basePromise usage
AmsterGet Jun 20, 2024
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
3 changes: 0 additions & 3 deletions lib/cypressReporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ class CypressReporter extends Mocha.reporters.Base {
});

this.runner.on(EVENT_RUN_END, () => {
if (CypressReporter.reporterOptions.launchId) {
return;
}
CypressReporter.calcTotalLaunches();
if (CypressReporter.shouldStopLaunch()) {
this.worker.send({ event: EVENT_RUN_END, launch: getLaunchStartObject(config) });
Expand Down
25 changes: 14 additions & 11 deletions lib/reporter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,20 @@ class Reporter {
}

runEnd() {
const finishLaunchPromise = this.client
.finishLaunch(
this.tempLaunchId,
Object.assign(
{
endTime: new Date().valueOf(),
},
this.launchStatus && { status: this.launchStatus },
),
)
.promise.then(() => {
const basePromise = this.config.reporterOptions.launchId
? this.client.getPromiseFinishAllItems(this.tempLaunchId)
AmsterGet marked this conversation as resolved.
Show resolved Hide resolved
: this.client.finishLaunch(
this.tempLaunchId,
Object.assign(
{
endTime: new Date().valueOf(),
},
this.launchStatus && { status: this.launchStatus },
),
).promise;

const finishLaunchPromise = basePromise
.then(() => {
const { launch, isLaunchMergeRequired } = this.config.reporterOptions;
if (isLaunchMergeRequired) {
deleteMergeLaunchLockFile(launch, this.tempLaunchId);
Expand Down