close webdriver/chrome before the client

Author: jakemac53

dwds/test/fixtures/context.dart

@@ -89,7 +89,7 @@ class TestContext {
           'Could not start ChromeDriver. Is it installed?\nError: $e');
     }
 
-    await Process.run('pub$_batExt', ['get'],
+    await Process.run('pub$_batExt', ['upgrade'],
         workingDirectory: workingDirectory);
 
     daemonClient = await connectClient(
@@ -152,27 +152,17 @@ class TestContext {
     appConnection = await testServer.dwds.connectedApps.first;
     if (enableDebugging) {
       debugConnection = await testServer.dwds.debugConnection(appConnection);
-      await debugConnection.vmService.streamListen('Isolate');
-      await debugConnection.vmService.onIsolateEvent
-          .firstWhere((e) => e.kind == 'IsolateStart');
       webkitDebugger = WebkitDebugger(WipDebugger(tabConnection));
     }
   }
 
   Future<Null> tearDown() async {
-    /// A hack to make sure we wait until all scripts are loaded
-    /// before exiting, otherwise we get async errors after the test
-    /// and it makes them flaky.
-    await debugConnection.vmService.getScripts(
-        (await debugConnection.vmService.getVM()).isolates.first.id);
-    await debugConnection.close();
-
+    await webDriver?.quit();
+    chromeDriver?.kill();
     DartUri.currentDirectory = p.current;
     _entryFile.writeAsStringSync(_entryContents);
     await daemonClient?.close();
     await testServer?.stop();
-    await webDriver?.quit();
-    chromeDriver.kill();
   }
 
   Future<void> changeInput() async {