address feedback

Author: yifanyang

scripts/emulator-testing/database-test-runner.ts

@@ -39,7 +39,7 @@ async function run(): Promise<void> {
     await emulator.setPublicRules();
     await runTest(emulator.port, emulator.namespace);
   } finally {
-    await emulator.tearDown();
+    emulator.tearDown();
   }
 }
 

scripts/emulator-testing/emulators/emulator.ts

@@ -21,6 +21,10 @@ import * as path from 'path';
 import * as request from 'request';
 import * as tmp from 'tmp';
 
+interface ChildProcessPromise extends Promise<void> {
+  childProcess: ChildProcess;
+}
+
 export abstract class Emulator {
   binaryName: string;
   binaryUrl: string;
@@ -57,7 +61,7 @@ export abstract class Emulator {
 
   async setUp(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-      const promise: any = spawn(
+      const promise: ChildProcessPromise = spawn(
         'java',
         ['-jar', path.basename(this.binaryPath), '--port', this.port],
         {
@@ -96,7 +100,7 @@ export abstract class Emulator {
     });
   }
 
-  async tearDown(): Promise<void> {
+  tearDown(): void {
     if (this.emulator) {
       console.log(`Shutting down emulator, pid: [${this.emulator.pid}] ...`);
       this.emulator.kill();

scripts/emulator-testing/firestore-test-runner.ts

@@ -40,7 +40,7 @@ async function run(): Promise<void> {
     await emulator.setUp();
     await runTest(emulator.port, emulator.projectId);
   } finally {
-    await emulator.tearDown();
+    emulator.tearDown();
   }
 }