From 803e2c84ff10cb12c95c0e8bff143b42375630f4 Mon Sep 17 00:00:00 2001
From: Jon Samwell <jonsamwell@gmail.com>
Date: Tue, 10 Nov 2020 08:55:38 +1100
Subject: [PATCH 1/2] fix(driver): remove wait before closing driver and
 swollow error on close

---
 lib/src/flutter/flutter_world.dart | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/src/flutter/flutter_world.dart b/lib/src/flutter/flutter_world.dart
index 7421101..263c869 100644
--- a/lib/src/flutter/flutter_world.dart
+++ b/lib/src/flutter/flutter_world.dart
@@ -45,21 +45,27 @@ class FlutterWorld extends World {
   }) async {
     try {
       if (_driver != null) {
-        await _driver
-            .waitUntilNoTransientCallbacks(timeout: timeout)
-            .catchError((e, st) {
-          // Avoid an unhandled error.
-          print(
-              'Error waiting for no transient callbacks from Flutter driver:\n\n`$e`\n\n$st');
-        });
+        // await _driver
+        //     .waitUntilNoTransientCallbacks(timeout: timeout)
+        //     .catchError(
+        //   (e, st) {
+        //     print(
+        //         'Error waiting for no transient callbacks from Flutter driver:\n\n`$e`\n\n$st');
 
-        await _driver.close().catchError((e, st) {
-          // Avoid an unhandled error.
-          print('Error closing Flutter driver:\n\n`$e`\n\n$st');
-        });
+        //     // Avoid an unhandled error
+        //     return null;
+        //   },
+        // );
+
+        await _driver.close().catchError(
+          (e, st) {
+            // print('Error closing Flutter driver:\n\n`$e`\n\n$st');
+
+            // Avoid an unhandled error
+            return null;
+          },
+        );
       }
-    } catch (e, st) {
-      print('Error closing Flutter driver:\n\n`$e`\n\n$st');
     } finally {
       _driver = null;
     }

From d73d9320a2fba5986da5859304af31718881b65a Mon Sep 17 00:00:00 2001
From: Jon Samwell <jonsamwell@gmail.com>
Date: Tue, 24 Nov 2020 13:27:55 +1100
Subject: [PATCH 2/2] fix(#93): removed comments

---
 lib/src/flutter/flutter_world.dart | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/src/flutter/flutter_world.dart b/lib/src/flutter/flutter_world.dart
index 263c869..d93e5c9 100644
--- a/lib/src/flutter/flutter_world.dart
+++ b/lib/src/flutter/flutter_world.dart
@@ -45,22 +45,8 @@ class FlutterWorld extends World {
   }) async {
     try {
       if (_driver != null) {
-        // await _driver
-        //     .waitUntilNoTransientCallbacks(timeout: timeout)
-        //     .catchError(
-        //   (e, st) {
-        //     print(
-        //         'Error waiting for no transient callbacks from Flutter driver:\n\n`$e`\n\n$st');
-
-        //     // Avoid an unhandled error
-        //     return null;
-        //   },
-        // );
-
         await _driver.close().catchError(
           (e, st) {
-            // print('Error closing Flutter driver:\n\n`$e`\n\n$st');
-
             // Avoid an unhandled error
             return null;
           },