From e44fc1356f3bc909ea1124eb6cf6df1479b30000 Mon Sep 17 00:00:00 2001
From: Gary Qian <garyq@google.com>
Date: Tue, 12 Feb 2019 15:02:45 -0800
Subject: [PATCH] Temporarily disable inconsistent golden tests due to test
 fonts (#27861)

---
 .../flutter/test/widgets/text_golden_test.dart | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/flutter/test/widgets/text_golden_test.dart b/packages/flutter/test/widgets/text_golden_test.dart
index 4adb609685..4347cfa4cc 100644
--- a/packages/flutter/test/widgets/text_golden_test.dart
+++ b/packages/flutter/test/widgets/text_golden_test.dart
@@ -244,7 +244,8 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.StrutDefault.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, 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(
@@ -271,7 +272,8 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.Strut.1.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, 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(
@@ -299,7 +301,8 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.Strut.2.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, 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(
@@ -350,7 +353,8 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.Strut.3.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, 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
@@ -385,7 +389,8 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.Strut.4.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, 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(
@@ -436,5 +441,6 @@ void main() {
       find.byType(Container),
       matchesGoldenFile('text_golden.StrutForce.1.png'),
     );
-  }, skip: !Platform.isLinux);
+  }, skip: true); // Should only be on linux (skip: !Platform.isLinux).
+                  // Disabled for now until font inconsistency is resolved.
 }