fix: tolerate git lock conflict

tmkx · Jan 22, 2024 · 7f4ae99 · 7f4ae99
1 parent 9b199d3
commit 7f4ae99
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 7 deletions.
diff --git a/packages/test-utils/src/shared.ts b/packages/test-utils/src/shared.ts
@@ -1,16 +1,31 @@
-import { IncomingMessage, RequestListener, ServerResponse, createServer } from 'node:http';
+import { IncomingMessage, RequestListener, ServerResponse, createServer as createHttpServer } from 'node:http';
+import { createServer as createNetServer } from 'node:net';
 
 export function sleep(ms: number) {
   return new Promise<void>((resolve) => setTimeout(resolve, ms));
 }
 
+export async function getRandomPort() {
+  const server = createNetServer();
+  server.listen(0);
+  return new Promise<number>((resolve, reject) => {
+    server.addListener('listening', () => {
+      const address = server.address();
+      if (!address || typeof address === 'string') reject('Invalid address');
+      else resolve(address.port);
+      server.close();
+    });
+    server.addListener('close', () => reject('Close'));
+  });
+}
+
 export interface CreateStaticServerOptions {
   handler?: RequestListener<typeof IncomingMessage, typeof ServerResponse>;
 }
 
 export async function createStaticServer({ handler }: CreateStaticServerOptions = {}) {
   const serverHandler = handler || ((_req, res) => res.end(`<html></html>`));
-  const server = createServer(serverHandler);
+  const server = createHttpServer(serverHandler);
   server.listen(0);
   return {
     server,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -8,12 +8,13 @@
     "@modern-js/utils": "^2.46.1",
     "@playwright/test": "^1.41.0",
     "@types/node": "^20.11.5",
+    "@webx-kit/chrome-types": "workspace:^",
     "@webx-kit/example-react": "workspace:^",
     "@webx-kit/example-solid": "workspace:^",
     "@webx-kit/example-svelte": "workspace:^",
     "@webx-kit/example-vue": "workspace:^",
-    "@webx-kit/chrome-types": "workspace:^",
     "@webx-kit/test-utils": "workspace:^",
+    "p-retry": "^6.2.0",
     "typescript": "^5.3.3"
   }
 }
diff --git a/tests/e2e/tests/webx-test.ts b/tests/e2e/tests/webx-test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import path from 'node:path';
-import { fs, execa, stripAnsi, wait } from '@modern-js/utils';
-import { createWebxTest } from '@webx-kit/test-utils/playwright';
+import { dynamicImport, fs, execa, stripAnsi, wait } from '@modern-js/utils';
+import { createWebxTest, getRandomPort } from '@webx-kit/test-utils/playwright';
 import { LaunchOptions } from '@playwright/test';
 
 export function createLaunchOptions(packageName: string, launchOptions?: LaunchOptions) {
@@ -43,7 +43,8 @@ export function startDev({ beforeAll, afterAll, afterEach }: typeof test) {
     baseDir = packageDir;
     const { stdout: dirtyFiles } = await execa('git', ['ls-files', '--modified'], { cwd: packageDir });
     if (!!dirtyFiles) throw new Error('make sure all modifications have been staged');
-    childProcess = execa('pnpm', ['dev'], { cwd: packageDir });
+    const PORT = String(await getRandomPort());
+    childProcess = execa('pnpm', ['dev'], { cwd: packageDir, env: { PORT } });
     await Promise.race([
       new Promise<void>((resolve) => {
         const handler = (chunk: unknown) => {
@@ -59,7 +60,11 @@ export function startDev({ beforeAll, afterAll, afterEach }: typeof test) {
       wait(20 * 1000).then((): Promise<void> => Promise.reject('Timeout')),
     ]);
   });
-  afterEach(() => execa('git', ['checkout', '.'], { cwd: baseDir }));
+  afterEach(async () => {
+    const { default: pRetry } = (await dynamicImport('p-retry')) as typeof import('p-retry');
+    // tolerate `.git/index.lock` conflict
+    await pRetry(() => execa('git', ['checkout', '.'], { cwd: baseDir }), { retries: 3 });
+  });
   afterAll(() => childProcess.kill('SIGINT'));
 
   const resolvePath = (file: string) => path.resolve(baseDir, file);