attempt to remove any code jitters

Author: chris-olszewski

packages/test/src/helpers.ts

@@ -4,6 +4,14 @@ import asyncRetry from 'async-retry';
 import { v4 as uuid4 } from 'uuid';
 import { Client, Connection } from '@temporalio/client';
 import * as iface from '@temporalio/proto';
+import {
+  createBaseBundlerOptions,
+  loadHistory as loadHistoryBase,
+  saveHistory as saveHistoryBase,
+  RUN_TIME_SKIPPING_TESTS,
+  test,
+  noopTest,
+} from '@temporalio/test-helpers';
 
 // Re-export from test-helpers
 export {
@@ -24,11 +32,8 @@ export {
   Worker,
   TestWorkflowEnvironment,
 } from '@temporalio/test-helpers';
-import {
-  createBaseBundlerOptions,
-  loadHistory as loadHistoryBase,
-  saveHistory as saveHistoryBase,
-} from '@temporalio/test-helpers';
+
+export const testTimeSkipping = RUN_TIME_SKIPPING_TESTS ? test : noopTest;
 
 /**
  * Package-specific bundler options that include local activity and mock-native-worker modules.

packages/test/src/test-ephemeral-server.ts

@@ -4,22 +4,15 @@ import { v4 as uuid4 } from 'uuid';
 import { bundleWorkflowCode, WorkflowBundle } from '@temporalio/worker';
 import { Connection } from '@temporalio/client';
 import { TestWorkflowEnvironment as RealTestWorkflowEnvironment } from '@temporalio/testing';
-import {
-  Worker,
-  TestWorkflowEnvironment,
-  RUN_TIME_SKIPPING_TESTS,
-  noopTest,
-  test as testFromHelpers,
-  getRandomPort,
-} from './helpers';
+import { Worker, TestWorkflowEnvironment, testTimeSkipping as anyTestTimeSkipping, getRandomPort } from './helpers';
 
 interface Context {
   bundle: WorkflowBundle;
   taskQueue: string;
 }
 
 const test = anyTest as TestFn<Context>;
-const testTimeSkipping = (RUN_TIME_SKIPPING_TESTS ? testFromHelpers : noopTest) as TestFn<Context>;
+const testTimeSkipping = anyTestTimeSkipping as TestFn<Context>;
 
 test.before(async (t) => {
   t.context.bundle = await bundleWorkflowCode({ workflowsPath: require.resolve('./workflows') });

…src/test-testenvironment-timeskipping.ts packages/test/src/test-testenvironment.tspackages/test/src/test-testenvironment-timeskipping.ts renamed to packages/test/src/test-testenvironment.ts packages/test/src/test-testenvironment-timeskipping.ts renamed to packages/test/src/test-testenvironment.ts

@@ -4,7 +4,7 @@ import { v4 as uuid4 } from 'uuid';
 import { WorkflowFailedError } from '@temporalio/client';
 import { bundleWorkflowCode, WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { workflowInterceptorModules } from '@temporalio/testing';
-import { RUN_TIME_SKIPPING_TESTS, test, noopTest, Worker, TestWorkflowEnvironment } from './helpers';
+import { Worker, TestWorkflowEnvironment, testTimeSkipping } from './helpers';
 import {
   assertFromWorkflow,
   asyncChildStarter,
@@ -14,8 +14,6 @@ import {
   waitOnSignalWithTimeout,
 } from './workflows/testenv-test-workflows';
 
-const testTimeSkipping = RUN_TIME_SKIPPING_TESTS ? test : (noopTest as unknown as typeof test);
-
 interface Context {
   testEnv: TestWorkflowEnvironment;
   bundle: WorkflowBundleWithSourceMap;

packages/test/src/workflows/testenv-test-workflows.ts

@@ -1,5 +1,5 @@
 /**
- * Workflows used in `test-testenvironment-timeskipping.ts`
+ * Workflows used in `test-testenvironment.ts`
  * @module
  */
 
@@ -9,11 +9,7 @@ import { sleep, proxyActivities, defineSignal, setHandler, startChild } from '@t
 // Export sleep to be invoked as a workflow
 export { sleep };
 
-interface Activities {
-  sleep(duration: number): Promise<void>;
-}
-
-const activities = proxyActivities<Activities>({ startToCloseTimeout: 2_000_000 });
+const activities = proxyActivities({ startToCloseTimeout: 2_000_000 });
 export const unblockSignal = defineSignal<[]>('unblock');
 
 export async function raceActivityAndTimer(expectedWinner: 'timer' | 'activity'): Promise<string> {