Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

test(windows): run packaged barrier outside the unit worker pool

ylliuuu6618542da32cbd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1804795579..a43ec6fb9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -286,6 +286,11 @@ jobs:
GITHUB_TOKEN: ${{ github.token }}
run: pnpm install:ripgrep
+ # A real PowerShell/CLR cold start must not compete with the unit worker pool.
+ # Keep the original mutex/lease assertions and startup budgets; run once per CI.
+ - name: Run Windows packaged-instance barrier integration
+ run: pnpm --filter desktop exec vitest run src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts --maxWorkers=1 --minWorkers=1
+
# 保留 Windows 路径、进程与锁的自测覆盖。
- name: Run Windows test runner self-tests
run: pnpm test:runner
diff --git a/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts b/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts
new file mode 100644
index 0000000000..3f1ddbb561
--- /dev/null
+++ b/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts
@@ -0,0 +1,43 @@
+import os from 'node:os';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { acquireWindowsPackagedInstanceBarrier } from '../windowsPackagedInstanceBarrier.js';
+
+// Real PowerShell/CLR startup belongs to the explicit integration tier. CI runs
+// this once, before other checks on its Windows runner, retaining every lease
+// and retry assertion and the production helper's existing startup budget.
+describe('windowsPackagedInstanceBarrier integration', () => {
+ it.runIf(process.platform === 'win32')(
+ 'holds the packaged startup mutex until release and allows a later retry',
+ async () => {
+ const programName = `CindyBarrierTest${process.pid}`;
+ const userDataDir = path.join(os.tmpdir(), programName);
+ const first = await acquireWindowsPackagedInstanceBarrier({
+ userDataDir,
+ programName,
+ timeoutMs: 1_000,
+ });
+ try {
+ expect(first.isHeld()).toBe(true);
+ await expect(
+ acquireWindowsPackagedInstanceBarrier({
+ userDataDir,
+ programName,
+ timeoutMs: 50,
+ }),
+ ).rejects.toThrow('startup barrier is busy');
+ } finally {
+ await first.release();
+ }
+ expect(first.isHeld()).toBe(false);
+
+ const retry = await acquireWindowsPackagedInstanceBarrier({
+ userDataDir,
+ programName,
+ timeoutMs: 1_000,
+ });
+ expect(retry.isHeld()).toBe(true);
+ await retry.release();
+ },
+ );
+});
diff --git a/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.test.ts b/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.test.ts
index d0caab923c..7e2360b69b 100644
--- a/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.test.ts
+++ b/apps/desktop/src/main/__tests__/windowsPackagedInstanceBarrier.test.ts
@@ -1,10 +1,7 @@
import { EventEmitter } from 'node:events';
-import os from 'node:os';
-import path from 'node:path';
import { describe, expect, it, vi } from 'vitest';
import {
- acquireWindowsPackagedInstanceBarrier,
__testing,
} from '../windowsPackagedInstanceBarrier.js';
@@ -76,37 +73,4 @@ describe('windowsPackagedInstanceBarrier', () => {
expect(finished).toBe(true);
});
- it.runIf(process.platform === 'win32')(
- 'holds the packaged startup mutex until release and allows a later retry',
- async () => {
- const programName = `CindyBarrierTest${process.pid}`;
- const userDataDir = path.join(os.tmpdir(), programName);
- const first = await acquireWindowsPackagedInstanceBarrier({
- userDataDir,
- programName,
- timeoutMs: 1_000,
- });
- try {
- expect(first.isHeld()).toBe(true);
- await expect(
- acquireWindowsPackagedInstanceBarrier({
- userDataDir,
- programName,
- timeoutMs: 50,
- }),
- ).rejects.toThrow('startup barrier is busy');
- } finally {
- await first.release();
- }
- expect(first.isHeld()).toBe(false);
-
- const retry = await acquireWindowsPackagedInstanceBarrier({
- userDataDir,
- programName,
- timeoutMs: 1_000,
- });
- expect(retry.isHeld()).toBe(true);
- await retry.release();
- },
- );
});
diff --git a/scripts/__tests__/test-workspaces.test.mjs b/scripts/__tests__/test-workspaces.test.mjs
index 35997ee914..851773e7e6 100644
--- a/scripts/__tests__/test-workspaces.test.mjs
+++ b/scripts/__tests__/test-workspaces.test.mjs
@@ -262,6 +262,11 @@ test("real agent integration tests are explicit tiers outside unit", () => {
assert.deepEqual(piManager.tiers.integration.include, [
"src/__tests__/pi-manager.integration.test.ts",
]);
+ assert.equal(desktop.tiers.integration.execution, "exclusive");
+ assert.deepEqual(desktop.tiers.integration.include, [
+ "src/main/local-agent/__tests__/*.integration.test.ts",
+ "src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts",
+ ]);
assert.deepEqual(desktop.tiers.e2e.include, [
"src/main/maker-host/__tests__/*.e2e.test.ts",
"src/main/remote-agent/__tests__/groupRelayClaudeFork.e2e.test.ts",
diff --git a/scripts/test-workspaces.config.mjs b/scripts/test-workspaces.config.mjs
index 50caa20f01..a2d4f9e89d 100644
--- a/scripts/test-workspaces.config.mjs
+++ b/scripts/test-workspaces.config.mjs
@@ -367,11 +367,14 @@ export default {
},
integration: {
status: 'manual',
- reason: 'Local application Agent protocol tests open real loopback sockets and temporary authorization stores.',
+ reason: 'Local Agent protocol tests open real sockets and stores; Windows packaged-instance tests start PowerShell and hold a real OS mutex.',
execution: 'exclusive',
coverage: 'allowlist',
command: vitestBin('run', '--maxWorkers=2'),
- include: ['src/main/local-agent/__tests__/*.integration.test.ts'],
+ include: [
+ 'src/main/local-agent/__tests__/*.integration.test.ts',
+ 'src/main/__tests__/windowsPackagedInstanceBarrier.integration.test.ts',
+ ],
},
'git-integration': {
status: 'manual',