making changes to utils and adding cleanup after unit tests failed

Author: nturgut

lib/web_ui/dev/felt.dart

@@ -9,8 +9,6 @@ import 'package:args/command_runner.dart';
 
 import 'build.dart';
 import 'clean.dart';
-import 'common.dart';
-import 'environment.dart';
 import 'licenses.dart';
 import 'test_runner.dart';
 import 'utils.dart';
@@ -39,7 +37,7 @@ void main(List<String> args) async {
     final bool result = await runner.run(args);
     if (result == false) {
       print('Sub-command returned false: `${args.join(' ')}`');
-      _cleanup();
+      await cleanup();
       io.exit(1);
     }
   } on UsageException catch (e) {
@@ -48,38 +46,13 @@ void main(List<String> args) async {
   } catch (e) {
     rethrow;
   } finally {
-    _cleanup();
+    await cleanup(browser: testCommand.browser);
   }
 
   // Sometimes the Dart VM refuses to quit.
   io.exit(io.exitCode);
 }
 
-void _cleanup() {
-  // Cleanup remaining processes if any.
-  if (processesToCleanUp.length > 0) {
-    for (io.Process process in processesToCleanUp) {
-      process.kill();
-    }
-  }
-  // Delete temporary directories.
-  if (temporaryDirectories.length > 0) {
-    for (io.Directory directory in temporaryDirectories) {
-      directory.deleteSync(recursive: true);
-    }
-  }
-
-  // Many tabs left open after Safari runs, quit safari.
-  if(testCommand.browser == 'safari') {
-    print('INFO: Safari tests run. Quit Safari.');
-    startProcess(
-      'osascript',
-      ['dev/quit_safari.scpt'],
-      workingDirectory: environment.webUiRootDir.path,
-    );
-  }
-}
-
 void _listenToShutdownSignals() {
   io.ProcessSignal.sigint.watch().listen((_) {
     print('Received SIGINT. Shutting down.');

lib/web_ui/dev/test_runner.dart

@@ -178,7 +178,9 @@ class TestCommand extends Command<bool> {
   /// Whether all tests should run.
   bool get runAllTests => targets.isEmpty;
 
-  String get browser => argResults['browser'];
+  /// Can be null if `felt clean` is called which also checks the browser,
+  /// uring cleanup phase.
+  String get browser => (argResults != null) ? argResults['browser'] : '';
 
   bool get isChrome => argResults['browser'] == 'chrome';
 
@@ -188,7 +190,7 @@ class TestCommand extends Command<bool> {
 
   Future<void> _runTargetTests(List<FilePath> targets) async {
     await _runTestBatch(targets, concurrency: 1, expectFailure: false);
-    _checkExitCode();
+    await _checkExitCode();
   }
 
   Future<void> _runAllTests() async {
@@ -234,12 +236,12 @@ class TestCommand extends Command<bool> {
           concurrency: 1,
           expectFailure: true,
         );
-        _checkExitCode();
+        await _checkExitCode();
       }
 
       // Run all unit-tests as a single batch.
       await _runTestBatch(unitTestFiles, concurrency: 10, expectFailure: false);
-      _checkExitCode();
+      await _checkExitCode();
 
       // Run screenshot tests one at a time.
       for (FilePath testFilePath in screenshotTestFiles) {
@@ -248,7 +250,7 @@ class TestCommand extends Command<bool> {
           concurrency: 1,
           expectFailure: false,
         );
-        _checkExitCode();
+        await _checkExitCode();
       }
     } else {
       final List<FilePath> unitTestFiles = <FilePath>[];
@@ -267,13 +269,14 @@ class TestCommand extends Command<bool> {
       }
       // Run all unit-tests as a single batch.
       await _runTestBatch(unitTestFiles, concurrency: 10, expectFailure: false);
-      _checkExitCode();
+      await _checkExitCode();
     }
   }
 
-  void _checkExitCode() {
+  void _checkExitCode() async {
     if (io.exitCode != 0) {
       io.stderr.writeln('Process exited with exit code ${io.exitCode}.');
+      await cleanup(browser: browser);
       io.exit(1);
     }
   }

lib/web_ui/dev/utils.dart

@@ -134,3 +134,29 @@ class ProcessException implements Exception {
     return '$message';
   }
 }
+
+/// Cleanup the remaning processes, close open browsers, delete temp files.
+void cleanup({String browser = 'chrome'}) async {
+  // Cleanup remaining processes if any.
+  if (processesToCleanUp.length > 0) {
+    for (io.Process process in processesToCleanUp) {
+      process.kill();
+    }
+  }
+  // Delete temporary directories.
+  if (temporaryDirectories.length > 0) {
+    for (io.Directory directory in temporaryDirectories) {
+      directory.deleteSync(recursive: true);
+    }
+  }
+
+  // Many tabs left open after Safari runs, quit safari.
+  if(browser == 'safari') {
+    print('INFO: Safari tests run. Quit Safari.');
+    await runProcess(
+      'osascript',
+      ['dev/quit_safari.scpt'],
+      workingDirectory: environment.webUiRootDir.path,
+    );
+  }
+}