fix unit tests once and for all

Author: ejizba

src/eventHandlers/WorkerInitHandler.ts

@@ -63,17 +63,14 @@ export class WorkerInitHandler extends EventHandler<'workerInitRequest', 'worker
 export function logColdStartWarning(channel: WorkerChannel, delayInMs?: number): void {
     // On reading a js file with function code('require') NodeJs tries to find 'package.json' all the way up to the file system root.
     // In Azure files it causes a delay during cold start as connection to Azure Files is an expensive operation.
-    if (
-        process.env.WEBSITE_CONTENTAZUREFILECONNECTIONSTRING &&
-        process.env.WEBSITE_CONTENTSHARE &&
-        process.env.AzureWebJobsScriptRoot
-    ) {
+    const scriptRoot = process.env.AzureWebJobsScriptRoot;
+    if (process.env.WEBSITE_CONTENTAZUREFILECONNECTIONSTRING && process.env.WEBSITE_CONTENTSHARE && scriptRoot) {
         // Add delay to avoid affecting coldstart
         if (!delayInMs) {
             delayInMs = 5000;
         }
         setTimeout(() => {
-            access(path.join(process.env.AzureWebJobsScriptRoot!, 'package.json'), constants.F_OK, (err) => {
+            access(path.join(scriptRoot, 'package.json'), constants.F_OK, (err) => {
                 if (isError(err)) {
                     channel.log({
                         message:

test/eventHandlers/FunctionEnvironmentReloadHandler.test.ts

@@ -70,23 +70,13 @@ describe('FunctionEnvironmentReloadHandler', () => {
     let stream: TestEventStream;
     let channel: WorkerChannel;
 
-    // Reset `process.env` and process.cwd() after this test suite so it doesn't affect other tests
-    let originalEnv: NodeJS.ProcessEnv;
-    let originalCwd: string;
     before(() => {
-        originalEnv = { ...process.env };
-        originalCwd = process.cwd();
         ({ stream, channel } = beforeEventHandlerSuite());
         channel.hostVersion = '2.7.0';
     });
 
-    after(() => {
-        Object.assign(process.env, originalEnv);
-    });
-
     afterEach(async () => {
         mock.restore();
-        process.chdir(originalCwd);
         await stream.afterEachEventHandlerTest();
     });
 

test/eventHandlers/TestEventStream.ts

@@ -8,10 +8,14 @@ import { AzureFunctionsRpcMessages as rpc } from '../../azure-functions-language
 import { IEventStream } from '../../src/GrpcClient';
 
 export class TestEventStream extends EventEmitter implements IEventStream {
+    originalEnv: NodeJS.ProcessEnv;
+    originalCwd: string;
     written: sinon.SinonSpy;
     constructor() {
         super();
         this.written = sinon.spy();
+        this.originalEnv = { ...process.env };
+        this.originalCwd = process.cwd();
     }
     write(message: rpc.IStreamingMessage) {
         this.written(message);
@@ -69,6 +73,15 @@ export class TestEventStream extends EventEmitter implements IEventStream {
      * Verifies the test didn't send any extraneous messages
      */
     async afterEachEventHandlerTest(): Promise<void> {
+        // Reset `process.env` and process.cwd() after each test so it doesn't affect other tests
+        process.chdir(this.originalCwd);
+        for (const key of Object.keys(process.env)) {
+            if (!(key in this.originalEnv)) {
+                delete process.env[key];
+            }
+        }
+        Object.assign(process.env, this.originalEnv);
+
         // minor delay so that it's more likely extraneous messages are associated with this test as opposed to leaking into the next test
         await new Promise((resolve) => setTimeout(resolve, 20));
         await this.assertCalledWith();

test/startApp.test.ts

@@ -43,27 +43,18 @@ describe('startApp', () => {
     let stream: TestEventStream;
     let coreApi: typeof coreTypes;
     let testDisposables: coreTypes.Disposable[] = [];
-    let originalEnv: NodeJS.ProcessEnv;
-    let originalCwd: string;
 
     before(async () => {
-        originalCwd = process.cwd();
-        originalEnv = { ...process.env };
         ({ stream, channel } = beforeEventHandlerSuite());
         coreApi = await import('@azure/functions-core');
     });
 
-    after(() => {
-        Object.assign(process.env, originalEnv);
-    });
-
     afterEach(async () => {
-        await stream.afterEachEventHandlerTest();
         coreApi.Disposable.from(...testDisposables).dispose();
         testDisposables = [];
-        process.chdir(originalCwd);
         channel.appHookData = {};
         channel.appLevelOnlyHookData = {};
+        await stream.afterEachEventHandlerTest();
     });
 
     it('runs app start hooks in non-specialization scenario', async () => {