unify

Author: deathbyknowledge

.github/workflows/pullrequest.yml

@@ -152,7 +152,7 @@ jobs:
 
       # Run E2E tests against deployed worker
       - name: Run E2E tests
-        run: npx vitest run --config vitest.e2e.shared.config.ts && npx vitest run --config vitest.e2e.isolated.config.ts
+        run: npx vitest run --config vitest.e2e.config.ts
         env:
           TEST_WORKER_URL: ${{ steps.get-url.outputs.worker_url }}
           CI: true

packages/sandbox/package.json

@@ -36,9 +36,7 @@
     "typecheck": "tsc --noEmit",
     "docker:local": "cd ../.. && docker build -f packages/sandbox/Dockerfile --target default --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version . && docker build -f packages/sandbox/Dockerfile --target python --platform linux/amd64 --build-arg SANDBOX_VERSION=$npm_package_version -t cloudflare/sandbox-test:$npm_package_version-python .",
     "test": "vitest run --config vitest.config.ts \"$@\"",
-    "test:e2e": "cd ../.. && vitest run --config vitest.e2e.shared.config.ts && vitest run --config vitest.e2e.isolated.config.ts",
-    "test:e2e:shared": "cd ../.. && vitest run --config vitest.e2e.shared.config.ts \"$@\"",
-    "test:e2e:isolated": "cd ../.. && vitest run --config vitest.e2e.isolated.config.ts \"$@\""
+    "test:e2e": "cd ../.. && vitest run --config vitest.e2e.config.ts \"$@\""
   },
   "exports": {
     ".": {

tests/e2e/bucket-mounting.test.ts

@@ -1,13 +1,8 @@
-import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
+import { beforeAll, describe, expect, test } from 'vitest';
 import {
-  cleanupSandbox,
-  createSandboxId,
-  createTestHeaders
-} from './helpers/test-fixtures';
-import {
-  getTestWorkerUrl,
-  type WranglerDevRunner
-} from './helpers/wrangler-runner';
+  getSharedSandbox,
+  createUniqueSession
+} from './helpers/global-sandbox';
 import type { ExecResult } from '@repo/shared';
 import type { SuccessResponse, BucketGetResponse } from './test-worker/types';
 
@@ -33,33 +28,19 @@ describe('Bucket Mounting E2E', () => {
   }
 
   describe('local', () => {
-    let runner: WranglerDevRunner | null;
     let workerUrl: string;
-    let currentSandboxId: string | null = null;
+    let headers: Record<string, string>;
 
     const TEST_BUCKET = 'sandbox-e2e-test';
     const MOUNT_PATH = '/mnt/test-data';
     const TEST_FILE = `e2e-test-${Date.now()}.txt`;
     const TEST_CONTENT = `Bucket mounting E2E test - ${new Date().toISOString()}`;
 
     beforeAll(async () => {
-      const result = await getTestWorkerUrl();
-      workerUrl = result.url;
-      runner = result.runner;
-    }, 30000);
-
-    afterEach(async () => {
-      if (currentSandboxId) {
-        await cleanupSandbox(workerUrl, currentSandboxId);
-        currentSandboxId = null;
-      }
-    });
-
-    afterAll(async () => {
-      if (runner) {
-        await runner.stop();
-      }
-    });
+      const sandbox = await getSharedSandbox();
+      workerUrl = sandbox.workerUrl;
+      headers = sandbox.createHeaders(createUniqueSession());
+    }, 120000);
 
     test('should mount bucket and perform bidirectional file operations', async () => {
       // Verify required credentials are present
@@ -76,9 +57,6 @@ describe('Bucket Mounting E2E', () => {
         );
       }
 
-      currentSandboxId = createSandboxId();
-      const headers = createTestHeaders(currentSandboxId);
-
       const PRE_EXISTING_FILE = `pre-existing-${Date.now()}.txt`;
       const PRE_EXISTING_CONTENT =
         'This file was created in R2 before mounting';

vitest.e2e.config.ts

@@ -0,0 +1,37 @@
+import { config } from 'dotenv';
+import { defineConfig } from 'vitest/config';
+
+config();
+
+/**
+ * E2E tests using shared sandbox - runs in parallel
+ * Tests use unique sessions for isolation within one container.
+ * Bucket-mounting tests self-skip locally (require FUSE/CI).
+ */
+export default defineConfig({
+  test: {
+    name: 'e2e',
+    globals: true,
+    environment: 'node',
+    include: ['tests/e2e/**/*.test.ts'],
+
+    testTimeout: 120000,
+    hookTimeout: 60000,
+    teardownTimeout: 30000,
+
+    // Global setup creates sandbox BEFORE threads spawn, passes info through a tmp file
+    globalSetup: ['tests/e2e/global-setup.ts'],
+
+    // Threads run in parallel - they all use the same sandbox through a tmp file
+    pool: 'threads',
+    poolOptions: {
+      threads: {
+        singleThread: false,
+        isolate: false
+      }
+    },
+    fileParallelism: true,
+
+    retry: 1
+  }
+});