test: add spec for child-process-gone
event for utility process
#40281
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
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