address feedback

Author: yifanyang

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

@@ -18,8 +18,9 @@ import { spawn } from 'child-process-promise';
 import * as path from 'path';
 
 import { DatabaseEmulator } from './emulators/database-emulator';
+import { ChildProcessPromise } from './emulators/emulator';
 
-async function runTest(port: number, namespace: string): Promise<any> {
+function runTest(port: number, namespace: string): ChildProcessPromise {
   const options = {
     cwd: path.resolve(__dirname, '../../packages/database'),
     env: Object.assign({}, process.env, {

scripts/emulator-testing/emulators/database-emulator.ts

@@ -29,7 +29,7 @@ export class DatabaseEmulator extends Emulator {
       'https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v3.5.0.jar';
   }
 
-  async setPublicRules(): Promise<number> {
+  setPublicRules(): Promise<number> {
     console.log('Setting rule {".read": true, ".write": true} to emulator ...');
     return new Promise<number>((resolve, reject) => {
       request.put(

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';
 
+export interface ChildProcessPromise extends Promise<void> {
+  childProcess: ChildProcess;
+}
+
 export abstract class Emulator {
   binaryName: string;
   binaryUrl: string;
@@ -33,7 +37,7 @@ export abstract class Emulator {
     this.port = port;
   }
 
-  async download(): Promise<void> {
+  download(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
       tmp.dir((err, dir) => {
         if (err) reject(err);
@@ -55,9 +59,9 @@ export abstract class Emulator {
     });
   }
 
-  async setUp(): Promise<void> {
+  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

@@ -17,9 +17,10 @@
 import { spawn } from 'child-process-promise';
 import * as path from 'path';
 
+import { ChildProcessPromise } from './emulators/emulator';
 import { FirestoreEmulator } from './emulators/firestore-emulator';
 
-async function runTest(port: number, projectId: string): Promise<any> {
+function runTest(port: number, projectId: string): ChildProcessPromise {
   const options = {
     cwd: path.resolve(__dirname, '../../packages/firestore'),
     env: Object.assign({}, process.env, {