From 0ef8b74df614e8fa8a715ae1c8598be615f8b114 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 3 Aug 2023 15:00:30 -0700
Subject: [PATCH 1/3] Skip flaky test

---
 dwds/test/events_test.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dwds/test/events_test.dart b/dwds/test/events_test.dart
index e8ddd4351..3002da255 100644
--- a/dwds/test/events_test.dart
+++ b/dwds/test/events_test.dart
@@ -157,7 +157,9 @@ void main() {
           ],
           () => keyboard.sendChord([Keyboard.alt, 'd']),
         );
-      });
+        },
+        skip: 'https://github.com/dart-lang/webdev/issues/2181',
+      );
 
       test('emits DEVTOOLS_LAUNCH event', () async {
         await expectEventDuring(

From 8b6214aee06f8d91a4ec3e8795b55463836a55ef Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 3 Aug 2023 15:08:59 -0700
Subject: [PATCH 2/3] Formatted

---
 dwds/test/events_test.dart | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/dwds/test/events_test.dart b/dwds/test/events_test.dart
index 3002da255..13e38c840 100644
--- a/dwds/test/events_test.dart
+++ b/dwds/test/events_test.dart
@@ -143,20 +143,22 @@ void main() {
         await context.tearDown();
       });
 
-      test('emits DEBUGGER_READY and DEVTOOLS_LOAD events', () async {
-        await expectEventsDuring(
-          [
-            matchesEvent(DwdsEventKind.debuggerReady, {
-              'elapsedMilliseconds': isNotNull,
-              'screen': equals('debugger'),
-            }),
-            matchesEvent(DwdsEventKind.devToolsLoad, {
-              'elapsedMilliseconds': isNotNull,
-              'screen': equals('debugger'),
-            }),
-          ],
-          () => keyboard.sendChord([Keyboard.alt, 'd']),
-        );
+      test(
+        'emits DEBUGGER_READY and DEVTOOLS_LOAD events',
+        () async {
+          await expectEventsDuring(
+            [
+              matchesEvent(DwdsEventKind.debuggerReady, {
+                'elapsedMilliseconds': isNotNull,
+                'screen': equals('debugger'),
+              }),
+              matchesEvent(DwdsEventKind.devToolsLoad, {
+                'elapsedMilliseconds': isNotNull,
+                'screen': equals('debugger'),
+              }),
+            ],
+            () => keyboard.sendChord([Keyboard.alt, 'd']),
+          );
         },
         skip: 'https://github.com/dart-lang/webdev/issues/2181',
       );

From 2d00312a71c996425880e416dbf45c12d1b984f2 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Fri, 4 Aug 2023 10:45:08 -0700
Subject: [PATCH 3/3] Try to fix test

---
 dwds/test/devtools_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dwds/test/devtools_test.dart b/dwds/test/devtools_test.dart
index 2dfa86f5a..961cae076 100644
--- a/dwds/test/devtools_test.dart
+++ b/dwds/test/devtools_test.dart
@@ -95,7 +95,7 @@ void main() {
       final devToolsWindow =
           windows.firstWhere((window) => window != newAppWindow);
       await devToolsWindow.setAsActive();
-      expect(await context.webDriver.title, equals('Dart DevTools'));
+      expect(await context.webDriver.pageSource, contains('DevTools'));
     });
 
     test(