Removed matchesGoldenFile and skips

packages/flutter/test/cupertino/date_picker_test.dart

@@ -855,8 +855,6 @@ void main() {
       await expectLater(
         find.byType(CupertinoDatePicker),
         matchesSkiaGoldFile('date_picker_test.datetime.initial.png')
-//        matchesGoldenFile('date_picker_test.datetime.initial.png'),
-//        skip: !Platform.isLinux
       );
 
       // Slightly drag the hour component to make the current hour off-center.
@@ -866,8 +864,6 @@ void main() {
       await expectLater(
         find.byType(CupertinoDatePicker),
         matchesSkiaGoldFile('date_picker_test.datetime.drag.png'),
-//        matchesGoldenFile('date_picker_test.datetime.drag.png'),
-//        skip: !Platform.isLinux
       );
   });
 }

packages/flutter/test/cupertino/nav_bar_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
@@ -801,13 +799,9 @@ void main() {
 
       await expectLater(
         find.byType(RepaintBoundary).last,
-        //matchesGoldenFile('nav_bar_test.standard_title.1.png'),
         matchesSkiaGoldFile('nav_bar_test.standard_title.png'),
       );
     },
-    // TODO(xster): remove once https://github.com/flutter/flutter/issues/17483
-    // is fixed.
-    // skip: !Platform.isLinux,
   );
 
   testWidgets(
@@ -836,14 +830,10 @@ void main() {
 
       await expectLater(
         find.byType(RepaintBoundary).last,
-        // matchesGoldenFile('nav_bar_test.large_title.1.png'),
         matchesSkiaGoldFile('nav_bar_test.large_title.png'),
       );
     },
-    // TODO(xster): remove once https://github.com/flutter/flutter/issues/17483
-    // is fixed.
-    // skip: !Platform.isLinux,
-   );
+  );
 
 
   testWidgets('NavBar draws a light system bar for a dark background', (WidgetTester tester) async {

packages/flutter/test/cupertino/segmented_control_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
-
 import 'package:flutter/widgets.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -1327,11 +1325,9 @@ void main() {
 
     await expectLater(
       find.byType(RepaintBoundary),
-      // matchesGoldenFile('segmented_control_test.0.0.png'),
       matchesSkiaGoldFile('segmented_control_test.0.png'),
     );
-  }, //skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('Golden Test Pressed State', (WidgetTester tester) async {
     final Map<int, Widget> children = <int, Widget>{};
@@ -1367,10 +1363,7 @@ void main() {
 
     await expectLater(
       find.byType(RepaintBoundary),
-      // matchesGoldenFile('segmented_control_test.1.0.png'),
       matchesSkiaGoldFile('segmented_control_test.1.png'),
     );
-  },
-  //  skip: !Platform.isLinux
-  );
+  },);
 }

packages/flutter/test/material/bottom_app_bar_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
-
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -73,19 +71,15 @@ void main() {
     await pump(FloatingActionButtonLocation.endDocked);
     await expectLater(
       find.byKey(key),
-      // matchesGoldenFile('bottom_app_bar.custom_shape.1.png'),
       matchesSkiaGoldFile('bottom_app_bar.custom_shape.1.png'),
     );
     await pump(FloatingActionButtonLocation.centerDocked);
     await tester.pumpAndSettle();
     await expectLater(
       find.byKey(key),
-      // matchesGoldenFile('bottom_app_bar.custom_shape.2.png'),
       matchesSkiaGoldFile('bottom_app_bar.custom_shape.2.png'),
     );
-  },
-  //  skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('color defaults to Theme.bottomAppBarColor', (WidgetTester tester) async {
     await tester.pumpWidget(

packages/flutter/test/material/bottom_app_bar_theme_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -83,8 +81,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('bottom_app_bar_theme.custom_shape.png'),
-      //matchesGoldenFile('bottom_app_bar_theme.custom_shape.png'),
-      //skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/material/bottom_navigation_bar_test.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
@@ -1149,8 +1148,6 @@ void main() {
       await expectLater(
         find.byType(BottomNavigationBar),
         matchesSkiaGoldFile('bottom_navigation_bar.shifting_transition.$pump.png'),
-        // matchesGoldenFile('bottom_navigation_bar.shifting_transition.2.$pump.png'),
-	      // skip: !Platform.isLinux,
       );
     }
   });

packages/flutter/test/material/card_theme_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -140,8 +138,6 @@ void main() {
     await expectLater(
       find.byKey(painterKey),
       matchesSkiaGoldFile('card_theme.custom_shape.png'),
-      // matchesGoldenFile('card_theme.custom_shape.png'),
-      // skip: !Platform.isLinux,
     );
   });
 }

packages/flutter/test/material/dialog_theme_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -133,8 +131,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('dialog_theme.dialog_with_custom_border.png'),
-      // matchesGoldenFile('dialog_theme.dialog_with_custom_border.png'),
-      // skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/material/dropdown_test.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
 import 'dart:math' as math;
 import 'dart:ui' show window;
 
@@ -142,8 +141,6 @@ void main() {
     await expectLater(
       find.ancestor(of: buttonFinder, matching: find.byType(RepaintBoundary)).first,
       matchesSkiaGoldFile('dropdown_test.default.png'),
-      // matchesGoldenFile('dropdown_test.default.0.png'),
-      // skip: !Platform.isLinux,
     );
   });
 
@@ -156,8 +153,6 @@ void main() {
     await expectLater(
       find.ancestor(of: buttonFinder, matching: find.byType(RepaintBoundary)).first,
       matchesSkiaGoldFile('dropdown_test.expanded.png'),
-      // matchesGoldenFile('dropdown_test.expanded.0.png'),
-      // skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/material/floating_action_button_test.dart

@@ -681,8 +681,6 @@ void main() {
     await expectLater(
       find.byKey(key),
       matchesSkiaGoldFile('floating_action_button_test.clip.png'),
-      // matchesGoldenFile('floating_action_button_test.clip.2.png'), // .clip.1.png is obsolete and can be removed
-      // skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/material/input_decorator_test.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:io' show Platform;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -2021,19 +2020,14 @@ void main() {
       await expectLater(
         find.byType(InputDecorator),
         matchesSkiaGoldFile('input_decorator.outline_icon_label.ltr.png'),
-        // matchesGoldenFile('input_decorator.outline_icon_label.ltr.png'),
-        // skip: !Platform.isLinux,
       );
 
       await tester.pumpWidget(buildFrame(TextDirection.rtl));
       await expectLater(
         find.byType(InputDecorator),
         matchesSkiaGoldFile('input_decorator.outline_icon_label.rtl.png'),
-        // matchesGoldenFile('input_decorator.outline_icon_label.rtl.png'),
-        // skip: !Platform.isLinux,
       );
     },
-//    skip: !Platform.isLinux,
   );
 
   testWidgets('InputDecorationTheme.toString()', (WidgetTester tester) async {

packages/flutter/test/material/material_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter/rendering.dart';
@@ -619,8 +617,6 @@ void main() {
       await expectLater(
         find.byKey(painterKey),
         matchesSkiaGoldFile('material.border_paint_above.png'),
-        // matchesGoldenFile('material.border_paint_above.png'),
-        // skip: !Platform.isLinux,
       );
     });
 
@@ -661,8 +657,6 @@ void main() {
       await expectLater(
         find.byKey(painterKey),
         matchesSkiaGoldFile('material.border_paint_below.png'),
-        // matchesGoldenFile('material.border_paint_below.png'),
-        // skip: !Platform.isLinux,
       );
     });
   });

packages/flutter/test/material/radio_test.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
 import 'dart:ui';
 
 import 'package:flutter/rendering.dart';
@@ -278,8 +277,6 @@ void main() {
     await expectLater(
       find.byKey(painterKey),
       matchesSkiaGoldFile('radio.ink_ripple.png'),
-      // matchesGoldenFile('radio.ink_ripple.png'),
-      // skip: !Platform.isLinux,
     );
   });
 }

packages/flutter/test/material/tab_bar_theme_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -270,8 +268,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('tab_bar_theme.tab_indicator_size_tab.png'),
-      // matchesGoldenFile('tab_bar_theme.tab_indicator_size_tab.png'),
-      // skip: !Platform.isLinux,
     );
   });
 
@@ -283,8 +279,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('tab_bar_theme.tab_indicator_size_label.png'),
-      // matchesGoldenFile('tab_bar_theme.tab_indicator_size_label.png'),
-      // skip: !Platform.isLinux,
     );
   });
 
@@ -301,8 +295,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('tab_bar_theme.custom_tab_indicator.png'),
-      // matchesGoldenFile('tab_bar_theme.custom_tab_indicator.png'),
-      // skip: !Platform.isLinux,
     );
   });
 
@@ -319,8 +311,6 @@ void main() {
     await expectLater(
       find.byKey(_painterKey),
       matchesSkiaGoldFile('tab_bar_theme.beveled_rect_indicator.png'),
-      // matchesGoldenFile('tab_bar_theme.beveled_rect_indicator.png'),
-      // skip: !Platform.isLinux,
     );
   });
 }

packages/flutter/test/painting/continous_rectangle_border_test.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
 import 'package:flutter/material.dart';
 import 'package:flutter/painting.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -73,8 +72,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('continuous_rectangle_border.golden_test_even_radii.png'),
-//      matchesGoldenFile('continuous_rectangle_border.golden_test_even_radii.png'),
-//      skip: !Platform.isLinux,
     );
   });
 
@@ -96,8 +93,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('continuous_rectangle_border.golden_test_varying_radii.png'),
-//      matchesGoldenFile('continuous_rectangle_border.golden_test_varying_radii.png'),
-//      skip: !Platform.isLinux,
     );
   });
 
@@ -116,8 +111,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('continuous_rectangle_border.golden_test_large_radii.png'),
-//      matchesGoldenFile('continuous_rectangle_border.golden_test_large_radii.png'),
-//      skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/rendering/localized_fonts_test.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' show Platform;
-
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -52,10 +50,8 @@ void main() {
       await expectLater(
         find.byType(RichText),
       matchesSkiaGoldFile('localized_fonts.rich_text.styled_text_span.png'),
-      //  matchesGoldenFile('localized_fonts.rich_text.styled_text_span.png'),
       );
     },
-    //skip: !Platform.isLinux,
   );
 
   testWidgets(
@@ -105,10 +101,8 @@ void main() {
       await expectLater(
         find.byType(Row),
         matchesSkiaGoldFile('localized_fonts.text_ambient_locale.chars.png'),
-//        matchesGoldenFile('localized_fonts.text_ambient_locale.chars.png'),
       );
     },
-//    skip: !Platform.isLinux,
   );
 
   testWidgets(
@@ -150,10 +144,8 @@ void main() {
       await expectLater(
         find.byType(Row),
         matchesSkiaGoldFile('localized_fonts.text_explicit_locale.chars.png'),
-//        matchesGoldenFile('localized_fonts.text_explicit_locale.chars.png'),
       );
     },
-//    skip: !Platform.isLinux,
   );
 
 }

packages/flutter/test/widgets/backdrop_filter_test.dart

@@ -42,9 +42,7 @@ void main() {
     );
     await expectLater(
       find.byType(RepaintBoundary).first,
-      matchesSkiaGoldFile('backdrop_filter_test.cull_rect.png')
-//      matchesGoldenFile('backdrop_filter_test.cull_rect.1.png'),
-//      skip: !Platform.isLinux,
+      matchesSkiaGoldFile('backdrop_filter_test.cull_rect.png'),
     );
   });
 }

packages/flutter/test/widgets/clip_test.dart

@@ -289,7 +289,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.ClipRect.png'),
-//      matchesGoldenFile('clip.ClipRect.1.png'),
     );
   });
 
@@ -330,7 +329,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.ClipRectOverlay.png')
-//      matchesGoldenFile('clip.ClipRectOverlay.1.png'),
     );
   });
 
@@ -380,7 +378,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.ClipRRect.png'),
-//      matchesGoldenFile('clip.ClipRRect.1.png'),
     );
   });
 
@@ -424,7 +421,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.ClipOval.png'),
-//      matchesGoldenFile('clip.ClipOval.1.png'),
     );
   });
 
@@ -473,7 +469,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.ClipPath.png'),
-//      matchesGoldenFile('clip.ClipPath.1.png'),
     );
   });
 
@@ -519,7 +514,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalModel.antiAlias.png'),
-//      matchesGoldenFile('clip.PhysicalModel.antiAlias.1.png'),
     );
   });
 
@@ -528,7 +522,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalModel.hardEdge.png'),
-//      matchesGoldenFile('clip.PhysicalModel.hardEdge.1.png'),
     );
   });
 
@@ -539,7 +532,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalModel.antiAliasWithSaveLayer.png'),
-//      matchesGoldenFile('clip.PhysicalModel.antiAliasWithSaveLayer.png'),
     );
   });
 
@@ -582,7 +574,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalModel.default.png'),
-//      matchesGoldenFile('clip.PhysicalModel.default.1.png'),
     );
   });
 
@@ -632,7 +623,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalShape.antiAlias.png'),
-//      matchesGoldenFile('clip.PhysicalShape.antiAlias.1.png'),
     );
   });
 
@@ -641,7 +631,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalShape.hardEdge.png'),
-//      matchesGoldenFile('clip.PhysicalShape.hardEdge.1.png'),
     );
   });
 
@@ -650,7 +639,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalShape.antiAliasWithSaveLayer.png'),
-//      matchesGoldenFile('clip.PhysicalShape.antiAliasWithSaveLayer.png'),
     );
   });
 
@@ -697,7 +685,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('clip.PhysicalShape.default.png'),
-//      matchesGoldenFile('clip.PhysicalShape.default.1.png'),
     );
   });
 

packages/flutter/test/widgets/editable_text_cursor_test.dart

@@ -90,11 +90,8 @@ void main() {
     await expectLater(
       find.byKey(const ValueKey<int>(1)),
       matchesSkiaGoldFile('editable_text_test.0.png'),
-//      matchesGoldenFile('editable_text_test.0.0.png'),
     );
-  },
-    //skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('cursor layout has correct radius', (WidgetTester tester) async {
     final GlobalKey<EditableTextState> editableTextKey = GlobalKey<EditableTextState>();
@@ -144,10 +141,8 @@ void main() {
     await expectLater(
       find.byKey(const ValueKey<int>(1)),
       matchesSkiaGoldFile('editable_text_test.1.png'),
-//      matchesGoldenFile('editable_text_test.1.0.png'),
     );
-  }, //skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('Cursor animates on iOS', (WidgetTester tester) async {
     final Widget widget = MaterialApp(

packages/flutter/test/widgets/invert_colors_test.dart

@@ -20,9 +20,7 @@ void main() {
 
     await expectLater(
       find.byType(RepaintBoundary),
-      matchesSkiaGoldFile('invert_colors_test.0.png')
-//      matchesGoldenFile('invert_colors_test.0.png'),
-//      skip: !Platform.isLinux,
+      matchesSkiaGoldFile('invert_colors_test.0.png'),
     );
   });
 
@@ -41,8 +39,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('invert_colors_test.1.png'),
-//      matchesGoldenFile('invert_colors_test.1.png'),
-//      skip: !Platform.isLinux,
     );
   });
 }

packages/flutter/test/widgets/list_wheel_scroll_view_test.dart

@@ -491,8 +491,6 @@ void main() {
       await expectLater(
         find.byKey(const Key('list_wheel_scroll_view')),
         matchesSkiaGoldFile('list_wheel_scroll_view.center_child.magnified.png'),
-//        matchesGoldenFile('list_wheel_scroll_view.center_child.magnified.png'),
-//        skip: !Platform.isLinux,
       );
     });
 
@@ -547,8 +545,6 @@ void main() {
       await expectLater(
         find.byKey(const Key('list_wheel_scroll_view')),
         matchesSkiaGoldFile('list_wheel_scroll_view.curved_wheel.left.png'),
-//        matchesGoldenFile('list_wheel_scroll_view.curved_wheel.left.png'),
-//        skip: !Platform.isLinux,
       );
     });
 

packages/flutter/test/widgets/opacity_test.dart

@@ -178,8 +178,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('opacity_test.offset.png'),
-//      matchesGoldenFile('opacity_test.offset.1.png'),
-//      skip: !Platform.isLinux,
     );
   });
 }

packages/flutter/test/widgets/physical_model_test.dart

@@ -66,8 +66,6 @@ void main() {
     await expectLater(
       find.byKey(key),
       matchesSkiaGoldFile('physical_model_overflow.png'),
-//      matchesGoldenFile('physical_model_overflow.png'),
-//      skip: !Platform.isLinux,
     );
   });
 

packages/flutter/test/widgets/shadow_test.dart

@@ -24,16 +24,13 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('shadow.BoxDecoration.disabled.png'),
-//      matchesGoldenFile('shadow.BoxDecoration.disabled.png'),
     );
     debugDisableShadows = false;
     tester.binding.reassembleApplication();
     await tester.pump();
-    // TODO(ianh): [May no longer apply] use the skip argument instead once that doesn't hang, https://github.com/dart-lang/test/issues/830
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('shadow.BoxDecoration.enabled.png'),
-//      matchesGoldenFile('shadow.BoxDecoration.enabled.png'),
     );
     debugDisableShadows = true;
   });
@@ -60,13 +57,10 @@ void main() {
       await expectLater(
         find.byType(Container),
         matchesSkiaGoldFile('shadow.ShapeDecoration.$elevation.png'),
-//        matchesGoldenFile('shadow.ShapeDecoration.$elevation.png'),
       );
     }
     debugDisableShadows = true;
-  },
-//    skip: !Platform.isLinux
-  ); // shadows render differently on different platforms
+  },);
 
   testWidgets('Shadows with PhysicalLayer', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -90,16 +84,13 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('shadow.PhysicalModel.disabled.0.png'),
-//      matchesGoldenFile('shadow.PhysicalModel.disabled.png'),
     );
     debugDisableShadows = false;
     tester.binding.reassembleApplication();
     await tester.pump();
-    // TODO(ianh): [May no longer apply] use the skip argument instead once that doesn't hang, https://github.com/dart-lang/test/issues/830
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('shadow.PhysicalModel.enabled.png'),
-//      matchesGoldenFile('shadow.PhysicalModel.enabled.png'),
     );
     debugDisableShadows = true;
   });
@@ -130,11 +121,8 @@ void main() {
       await expectLater(
         find.byType(Container),
         matchesSkiaGoldFile('shadow.PhysicalModel.disabled.1.$elevation.png'),
-//        matchesGoldenFile('shadow.PhysicalModel.disabled.png'),
       );
     }
     debugDisableShadows = true;
-  },
-//    skip: !Platform.isLinux
-  );
+  },);
 }
\ No newline at end of file

packages/flutter/test/widgets/text_golden_test.dart

@@ -30,7 +30,6 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Centered.png'),
-//      matchesGoldenFile('text_golden.Centered.png'),
     );
 
     await tester.pumpWidget(
@@ -55,11 +54,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Centered.wrap.png'),
-//      matchesGoldenFile('text_golden.Centered.wrap.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  );
+  },);
 
 
   testWidgets('Text Foreground', (WidgetTester tester) async {
@@ -89,7 +85,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('text_golden.Foreground.gradient.png'),
-//      matchesGoldenFile('text_golden.Foreground.gradient.png'),
     );
 
     await tester.pumpWidget(
@@ -112,7 +107,6 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('text_golden.Foreground.stroke.png'),
-//      matchesGoldenFile('text_golden.Foreground.stroke.png'),
     );
 
     await tester.pumpWidget(
@@ -136,11 +130,8 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('text_golden.Foreground.stroke_and_gradient.png'),
-//      matchesGoldenFile('text_golden.Foreground.stroke_and_gradient.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  );
+  },);
 
   // TODO(garyq): This test requires an update when the background
   // drawing from the beginning of the line bug is fixed. The current
@@ -189,11 +180,8 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary),
       matchesSkiaGoldFile('text_golden.Background.png'),
-//      matchesGoldenFile('text_golden.Background.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('Text Fade', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -228,11 +216,8 @@ void main() {
     await expectLater(
       find.byType(RepaintBoundary).first,
       matchesSkiaGoldFile('text_golden.Fade.1.png'),
-//      matchesGoldenFile('text_golden.Fade.1.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  );
+  },);
 
   testWidgets('Default Strut text', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -256,12 +241,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.StrutDefault.png'),
-//      matchesGoldenFile('text_golden.StrutDefault.png'),
     );
-  },
-//    skip: true // Should only be on linux (skip: !Platform.isLinux).
-                 // Disabled for now until font inconsistency is resolved.
-  );
+  },);
 
   testWidgets('Strut text 1', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -287,11 +268,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Strut.1.png')
-//      matchesGoldenFile('text_golden.Strut.1.1.png'),
     );
-  },
-    // skip: true // Should only be on linux (skip: !Platform.isLinux).
-  );              // Disabled for now until font inconsistency is resolved.
+  },);
 
   testWidgets('Strut text 2', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -318,11 +296,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Strut.2.png')
-//      matchesGoldenFile('text_golden.Strut.2.1.png'),
     );
-  },
-    // skip: true // Should only be on linux (skip: !Platform.isLinux).
-  );              // Disabled for now until font inconsistency is resolved.
+  },);
 
   testWidgets('Strut text rich', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -372,11 +347,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Strut.3.png')
-//      matchesGoldenFile('text_golden.Strut.3.1.png'),
     );
-  },
-    // skip: true // Should only be on linux (skip: !Platform.isLinux).
-  );              // Disabled for now until font inconsistency is resolved.
+  },);
 
   testWidgets('Strut text font fallback', (WidgetTester tester) async {
     // Font Fallback
@@ -409,12 +381,9 @@ void main() {
     );
     await expectLater(
       find.byType(Container),
-      matchesSkiaGoldFile('text_golden.Strut.4.png')
-//      matchesGoldenFile('text_golden.Strut.4.1.png'),
+      matchesSkiaGoldFile('text_golden.Strut.4.png'),
     );
-  },
-    // skip: true // Should only be on linux (skip: !Platform.isLinux).
-  );              // Disabled for now until font inconsistency is resolved.
+  },);
 
   testWidgets('Strut text rich forceStrutHeight', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -463,12 +432,9 @@ void main() {
     );
     await expectLater(
       find.byType(Container),
-      matchesSkiaGoldFile('text_golden.StrutForce.1.png')
-//      matchesGoldenFile('text_golden.StrutForce.1.1.png'),
+      matchesSkiaGoldFile('text_golden.StrutForce.1.png'),
     );
-  },
-    // skip: true // Should only be on linux (skip: !Platform.isLinux).
-  );              // Disabled for now until font inconsistency is resolved.
+  },);
 
   testWidgets('Decoration thickness', (WidgetTester tester) async {
     final TextDecoration allDecorations = TextDecoration.combine(
@@ -505,11 +471,8 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.Decoration.1.png'),
-//      matchesGoldenFile('text_golden.Decoration.1.0.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  ); // Coretext uses different thicknesses for decoration
+  },);
 
   testWidgets('Decoration thickness', (WidgetTester tester) async {
     final TextDecoration allDecorations = TextDecoration.combine(
@@ -547,9 +510,6 @@ void main() {
     await expectLater(
       find.byType(Container),
       matchesSkiaGoldFile('text_golden.DecorationThickness.1.png'),
-//      matchesGoldenFile('text_golden.DecorationThickness.1.0.png'),
     );
-  },
-//    skip: !Platform.isLinux
-  ); // Coretext uses different thicknesses for decoration
+  },);
 }

packages/flutter/test/widgets/widget_inspector_test.dart

@@ -1829,8 +1829,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
       await expectLater(
         layer.toImage(renderObject.semanticBounds.inflate(50.0)),
         matchesSkiaGoldFile('inspector.repaint_boundary_margin.png'),
-//        matchesGoldenFile('inspector.repaint_boundary_margin.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Regression test for how rendering with a pixel scale other than 1.0
@@ -1841,8 +1839,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           pixelRatio: 0.5,
         ),
         matchesSkiaGoldFile('inspector.repaint_boundary_margin_small.png'),
-//        matchesGoldenFile('inspector.repaint_boundary_margin_small.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -1851,8 +1847,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           pixelRatio: 2.0,
         ),
         matchesSkiaGoldFile('inspector.repaint_boundary_margin_large.png'),
-//        matchesGoldenFile('inspector.repaint_boundary_margin_large.png'),
-//        skip: !Platform.isLinux,
       );
 
       final Layer layerParent = layer.parent;
@@ -1868,8 +1862,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 300.0,
         ),
         matchesSkiaGoldFile('inspector.repaint_boundary.png'),
-//        matchesGoldenFile('inspector.repaint_boundary.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Verify that taking a screenshot didn't change the layers associated with
@@ -1887,8 +1879,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           margin: 50.0,
         ),
         matchesSkiaGoldFile('inspector.repaint_boundary_margin.png'),
-//        matchesGoldenFile('inspector.repaint_boundary_margin.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Verify that taking a screenshot didn't change the layers associated with
@@ -1909,8 +1899,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.repaint_boundary_debugPaint.png'),
-//        matchesGoldenFile('inspector.repaint_boundary_debugPaint.png'),
-//        skip: !Platform.isLinux,
       );
       // Verify that taking a screenshot with debug paint on did not change
       // the number of children the layer has.
@@ -1921,8 +1909,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
       await expectLater(
         find.byType(RepaintBoundaryWithDebugPaint),
         matchesSkiaGoldFile('inspector.repaint_boundary.png'),
-//        matchesGoldenFile('inspector.repaint_boundary.png'),
-//        skip: !Platform.isLinux,
       );
 
       expect(renderObject.debugLayer, equals(layer));
@@ -1936,8 +1922,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 100.0,
         ),
         matchesSkiaGoldFile('inspector.container.png'),
-//        matchesGoldenFile('inspector.container.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -1948,8 +1932,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.container_debugPaint.png'),
-//        matchesGoldenFile('inspector.container_debugPaint.png'),
-//        skip: !Platform.isLinux,
       );
 
       {
@@ -1970,8 +1952,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
             debugPaint: true,
           ),
           matchesSkiaGoldFile('inspector.container_debugPaint.png'),
-//          matchesGoldenFile('inspector.container_debugPaint.png'),
-//          skip: !Platform.isLinux,
         );
         expect(container.debugNeedsLayout, isFalse);
       }
@@ -1984,8 +1964,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 100.0,
         ),
         matchesSkiaGoldFile('inspector.container_small.png'),
-//        matchesGoldenFile('inspector.container_small.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -1996,8 +1974,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           maxPixelRatio: 3.0,
         ),
         matchesSkiaGoldFile('inspector.container_large.png'),
-//        matchesGoldenFile('inspector.container_large.png'),
-//        skip: !Platform.isLinux,
       );
 
       // This screenshot will show the clip rect debug paint but no other
@@ -2010,8 +1986,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.clipRect_debugPaint.png'),
-//        matchesGoldenFile('inspector.clipRect_debugPaint.png'),
-//        skip: !Platform.isLinux,
       );
 
       final Element clipRect = find.byType(ClipRRect).evaluate().single;
@@ -2028,8 +2002,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
       await expectLater(
         clipRectScreenshot,
         matchesSkiaGoldFile('inspector.clipRect_debugPaint_margin.png'),
-//        matchesGoldenFile('inspector.clipRect_debugPaint_margin.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Verify we get the same image if we go through the service extension
@@ -2069,8 +2041,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.padding_debugPaint.png'),
-//        matchesGoldenFile('inspector.padding_debugPaint.png'),
-//        skip: !Platform.isLinux,
       );
 
       // The bounds for this box crop its rendered content.
@@ -2082,8 +2052,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.sizedBox_debugPaint.png'),
-//        matchesGoldenFile('inspector.sizedBox_debugPaint.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Verify that setting a margin includes the previously cropped content.
@@ -2096,8 +2064,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           debugPaint: true,
         ),
         matchesSkiaGoldFile('inspector.sizedBox_debugPaint_margin.png'),
-//        matchesGoldenFile('inspector.sizedBox_debugPaint_margin.png'),
-//        skip: !Platform.isLinux,
       );
     });
 
@@ -2169,8 +2135,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
       await expectLater(
         find.byKey(mainStackKey),
         matchesSkiaGoldFile('inspector.composited_transform.only_offsets.png'),
-//        matchesGoldenFile('inspector.composited_transform.only_offsets.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -2180,15 +2144,11 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 500.0,
         ),
         matchesSkiaGoldFile('inspector.composited_transform.only_offsets_follower.png'),
-//        matchesGoldenFile('inspector.composited_transform.only_offsets_follower.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
         WidgetInspectorService.instance.screenshot(find.byType(Stack).evaluate().first, width: 300.0, height: 300.0),
         matchesSkiaGoldFile('inspector.composited_transform.only_offsets_small.png'),
-//        matchesGoldenFile('inspector.composited_transform.only_offsets_small.1.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -2198,8 +2158,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 500.0,
         ),
         matchesSkiaGoldFile('inspector.composited_transform.only_offsets_target.png'),
-//        matchesGoldenFile('inspector.composited_transform.only_offsets_target.png'),
-//        skip: !Platform.isLinux,
       );
     });
 
@@ -2272,8 +2230,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
       await expectLater(
         find.byKey(mainStackKey),
         matchesSkiaGoldFile('inspector.composited_transform.with_rotations.png'),
-//        matchesGoldenFile('inspector.composited_transform.with_rotations.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -2283,8 +2239,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 500.0,
         ),
         matchesSkiaGoldFile('inspector.composited_transform.with_rotations_small.png'),
-//        matchesGoldenFile('inspector.composited_transform.with_rotations_small.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -2294,8 +2248,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 500.0,
         ),
         matchesSkiaGoldFile('inspector.composited_transform.with_rotations_target.png'),
-//        matchesGoldenFile('inspector.composited_transform.with_rotations_target.png'),
-//        skip: !Platform.isLinux,
       );
 
       await expectLater(
@@ -2305,8 +2257,6 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
           height: 500.0,
         ),
         matchesSkiaGoldFile('inspector.composited_transform.with_rotations_follower.png'),
-//        matchesGoldenFile('inspector.composited_transform.with_rotations_follower.png'),
-//        skip: !Platform.isLinux,
       );
 
       // Make sure taking screenshots hasn't modified the positions of the