Merge branch 'master' into master

linchen2chris · Oct 8, 2023 · 46dbd03 · 46dbd03
2 parents 2f1a5a9 + edf6625
commit 46dbd03
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-8711c1fd21915f55c16c64f4f511241977f1763e
+03c8c772487349714e7b7a0893dae324b1e65ae4
diff --git a/bin/internal/fuchsia-linux.version b/bin/internal/fuchsia-linux.version
@@ -1 +1 @@
-a-BbzDtY3w8UXYgbKZI4BKjc61kI90tytahfKAhzyCgC
+8ri3ggb_SASX6KpNnqJqZSb4lGBNEt9SiejhQFkJQpsC
diff --git a/bin/internal/fuchsia-mac.version b/bin/internal/fuchsia-mac.version
@@ -1 +1 @@
-GXgrnmetc14RPdheorFF2QUaTvtY-2ceYTD6nFzY6ogC
+qf94AgyANg4i0SupyLHVTKhPCmAC0zhqiAum8YdPRGIC
diff --git a/packages/flutter/test/cupertino/context_menu_test.dart b/packages/flutter/test/cupertino/context_menu_test.dart
@@ -318,7 +318,11 @@ void main() {
       final Container decoyLaterContainer = tester.firstElement(findBuilderDecoyChild()).widget as Container;
       final BoxDecoration? decoyLaterDecoration = decoyLaterContainer.decoration as BoxDecoration?;
       expect(decoyLaterDecoration?.borderRadius, isNot(equals(BorderRadius.circular(0))));
-    });
+    },
+    // TODO(polina-c): remove after fixing flakiness
+    // https://github.com/flutter/flutter/issues/136132
+    leakTrackingTestConfig: const LeakTrackingTestConfig(notDisposedAllowList: <String, int?>{'ValueNotifier<_OverlayEntryWidgetState?>' : 1}),
+    );
 
     testWidgetsWithLeakTracking('Hovering over Cupertino context menu updates cursor to clickable on Web', (WidgetTester tester) async {
       final Widget child  = getChild();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8711c1fd21915f55c16c64f4f511241977f1763e
		03c8c772487349714e7b7a0893dae324b1e65ae4
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a-BbzDtY3w8UXYgbKZI4BKjc61kI90tytahfKAhzyCgC
		8ri3ggb_SASX6KpNnqJqZSb4lGBNEt9SiejhQFkJQpsC
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		GXgrnmetc14RPdheorFF2QUaTvtY-2ceYTD6nFzY6ogC
		qf94AgyANg4i0SupyLHVTKhPCmAC0zhqiAum8YdPRGIC