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.

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

test: add spec for child-process-gone event for utility process #40281

Merged
merged 1 commit into from
Oct 23, 2023

test: add spec for `child-process-gone` event for utility process

867fe6f
Select commit
Failed to load commit list.
Merged

test: add spec for child-process-gone event for utility process #40281

test: add spec for `child-process-gone` event for utility process
867fe6f
Select commit
Failed to load commit list.
trop / Backportable? - 26-x-y completed Oct 20, 2023 in 45s

Backport Failed

This PR was checked and could not be automatically backported to "26-x-y" cleanly

Details

Failed Diff:

diff --cc spec/api-utility-process-spec.ts
index 5594803c2a,b87920d354..0000000000
--- a/spec/api-utility-process-spec.ts
+++ b/spec/api-utility-process-spec.ts
@@@ -1,10 -1,11 +1,16 @@@
  import { expect } from 'chai';
++<<<<<<< HEAD
 +import * as childProcess from 'child_process';
 +import * as path from 'path';
 +import { BrowserWindow, MessageChannelMain, utilityProcess } from 'electron/main';
++=======
+ import * as childProcess from 'node:child_process';
+ import * as path from 'node:path';
+ import { BrowserWindow, MessageChannelMain, utilityProcess, app } from 'electron/main';
++>>>>>>> test: add spec for `child-process-gone` event for utility process
  import { ifit } from './lib/spec-helpers';
  import { closeWindow } from './lib/window-helpers';
 -import { once } from 'node:events';
 -import { pathToFileURL } from 'node:url';
 +import { once } from 'events';
  
  const fixturesPath = path.resolve(__dirname, 'fixtures', 'api', 'utility-process');
  const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64';

Annotations

Check failure on line 4 in spec/api-utility-process-spec.ts

See this annotation in the file changed.

@trop trop / Backportable? - 26-x-y

spec/api-utility-process-spec.ts#L2-L4

Patch Conflict
Raw output
++<<<<<<< HEAD
 +import * as childProcess from 'child_process';
 +import * as path from 'path';
 +import { BrowserWindow, MessageChannelMain, utilityProcess } from 'electron/main';
++=======
+ import * as childProcess from 'node:child_process';
+ import * as path from 'node:path';
+ import { BrowserWindow, MessageChannelMain, utilityProcess, app } from 'electron/main';
++>>>>>>> test: add spec for `child-process-gone` event for utility process