Revert "Refactoring Gold to enable both Luci & Cirrus support (#49815)" (#52670)

This reverts commit 7edcc92b.

packages/flutter/lib/src/cupertino/action_sheet.dart

@@ -85,8 +85,7 @@ const double _kDividerThickness = 1.0;
 /// sheet title and message text style.
 ///
 /// To display action buttons that look like standard iOS action sheet buttons,
-/// provide [CupertinoActionSheetAction]s for the [actions] given to this action
-/// sheet.
+/// provide [CupertinoActionSheetAction]s for the [actions] given to this action sheet.
 ///
 /// To include a iOS-style cancel button separate from the other buttons,
 /// provide an [CupertinoActionSheetAction] for the [cancelButton] given to this

packages/flutter_goldens/test/flutter_goldens_test.dart

@@ -108,7 +108,6 @@ void main() {
         process: process,
         platform: platform,
         httpClient: mockHttpClient,
-        ci: ContinuousIntegrationEnvironment.cirrus,
       );
 
       when(process.run(any))
@@ -166,76 +165,6 @@ void main() {
       );
     });
 
-    test('correctly inits tryjob for luci', () async {
-      platform = FakePlatform(
-        environment: <String, String>{
-          'FLUTTER_ROOT': _kFlutterRoot,
-          'GOLDCTL' : 'goldctl',
-          'SWARMING_TASK_ID' : '4ae997b50dfd4d11',
-          'LOGDOG_STREAM_PREFIX' : 'buildbucket/cr-buildbucket.appspot.com/8885996262141582672',
-          'GOLD_TRYJOB' : 'refs/pull/49815/head',
-        },
-        operatingSystem: 'macos'
-      );
-
-      skiaClient = SkiaGoldClient(
-        workDirectory,
-        fs: fs,
-        process: process,
-        platform: platform,
-        httpClient: mockHttpClient,
-        ci: ContinuousIntegrationEnvironment.luci,
-      );
-
-      final List<String> ciArguments = skiaClient.getCIArguments();
-
-      expect(
-        ciArguments,
-        equals(
-          <String>[
-            '--changelist', '49815',
-            '--cis', 'buildbucket',
-            '--jobid', '8885996262141582672',
-          ],
-        ),
-      );
-    });
-
-    test('correctly inits tryjob for cirrus', () async {
-      platform = FakePlatform(
-        environment: <String, String>{
-          'FLUTTER_ROOT': _kFlutterRoot,
-          'GOLDCTL' : 'goldctl',
-          'CIRRUS_CI' : 'true',
-          'CIRRUS_TASK_ID' : '8885996262141582672',
-          'CIRRUS_PR' : '49815',
-        },
-        operatingSystem: 'macos'
-      );
-
-      skiaClient = SkiaGoldClient(
-        workDirectory,
-        fs: fs,
-        process: process,
-        platform: platform,
-        httpClient: mockHttpClient,
-        ci: ContinuousIntegrationEnvironment.cirrus,
-      );
-
-      final List<String> ciArguments = skiaClient.getCIArguments();
-
-      expect(
-        ciArguments,
-        equals(
-          <String>[
-            '--changelist', '49815',
-            '--cis', 'cirrus',
-            '--jobid', '8885996262141582672',
-          ],
-        ),
-      );
-    });
-
     group('Request Handling', () {
       String testName;
       String pullRequestNumber;
@@ -527,12 +456,12 @@ void main() {
   });
 
   group('FlutterGoldenFileComparator', () {
-    FlutterPostSubmitFileComparator comparator;
+    FlutterSkiaGoldFileComparator comparator;
 
     setUp(() {
       final Directory basedir = fs.directory('flutter/test/library/')
         ..createSync(recursive: true);
-      comparator = FlutterPostSubmitFileComparator(
+      comparator = FlutterSkiaGoldFileComparator(
         basedir.uri,
         MockSkiaGoldClient(),
         fs: fs,
@@ -568,7 +497,7 @@ void main() {
       setUp(() {
         final Directory basedir = fs.directory('flutter/test/library/')
           ..createSync(recursive: true);
-        comparator = FlutterPostSubmitFileComparator(
+        comparator = FlutterSkiaGoldFileComparator(
           basedir.uri,
           mockSkiaClient,
           fs: fs,
@@ -577,21 +506,7 @@ void main() {
       });
 
       group('correctly determines testing environment', () {
-        test('returns true for Luci', () {
-          platform = FakePlatform(
-            environment: <String, String>{
-              'FLUTTER_ROOT': _kFlutterRoot,
-              'SWARMING_TASK_ID' : '12345678990',
-            },
-            operatingSystem: 'macos'
-          );
-          expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
-            isTrue,
-          );
-        });
-
-        test('returns true for Cirrus', () {
+        test('returns true', () {
           platform = FakePlatform(
             environment: <String, String>{
               'FLUTTER_ROOT': _kFlutterRoot,
@@ -603,7 +518,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkiaGoldFileComparator.isAvailableForEnvironment(platform),
             isTrue,
           );
         });
@@ -620,7 +535,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkiaGoldFileComparator.isAvailableForEnvironment(platform),
             isFalse,
           );
         });
@@ -636,7 +551,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkiaGoldFileComparator.isAvailableForEnvironment(platform),
             isFalse,
           );
         });
@@ -651,7 +566,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkiaGoldFileComparator.isAvailableForEnvironment(platform),
             isFalse,
           );
         });
@@ -668,7 +583,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterPostSubmitFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkiaGoldFileComparator.isAvailableForEnvironment(platform),
             isFalse,
           );
         });
@@ -680,7 +595,7 @@ void main() {
       final MockSkiaGoldClient mockSkiaClient = MockSkiaGoldClient();
 
       group('correctly determines testing environment', () {
-        test('returns true for Cirrus', () {
+        test('returns true', () {
           platform = FakePlatform(
             environment: <String, String>{
               'FLUTTER_ROOT': _kFlutterRoot,
@@ -696,21 +611,6 @@ void main() {
           );
         });
 
-        test('returns true for Luci', () {
-          platform = FakePlatform(
-            environment: <String, String>{
-              'FLUTTER_ROOT': _kFlutterRoot,
-              'SWARMING_TASK_ID' : '12345678990',
-              'GOLD_TRYJOB' : 'git/ref/12345/head'
-            },
-            operatingSystem: 'macos'
-          );
-          expect(
-            FlutterPreSubmitFileComparator.isAvailableForEnvironment(platform),
-            isTrue,
-          );
-        });
-
         test('returns false - no PR', () {
           platform = FakePlatform(
             environment: <String, String>{
@@ -742,7 +642,7 @@ void main() {
           );
         });
 
-        test('returns false - not on Cirrus or Luci', () {
+        test('returns false - not on Cirrus', () {
           platform = FakePlatform(
             environment: <String, String>{
               'FLUTTER_ROOT': _kFlutterRoot,
@@ -865,20 +765,33 @@ void main() {
 
     group('Skipping', () {
       group('correctly determines testing environment', () {
-        test('returns true on Cirrus shards that don\'t run golden tests', () {
+        test('returns true on LUCI', () {
           platform = FakePlatform(
             environment: <String, String>{
               'FLUTTER_ROOT': _kFlutterRoot,
-              'CIRRUS_CI' : 'yep',
+              'SWARMING_TASK_ID' : '1234567890',
             },
             operatingSystem: 'macos'
           );
           expect(
-            FlutterSkippingFileComparator.isAvailableForEnvironment(platform),
+            FlutterSkippingGoldenFileComparator.isAvailableForEnvironment(platform),
             isTrue,
           );
         });
 
+        test('returns true on Cirrus', () {
+          platform = FakePlatform(
+            environment: <String, String>{
+              'FLUTTER_ROOT': _kFlutterRoot,
+              'CIRRUS_CI' : 'yep',
+            },
+            operatingSystem: 'macos'
+          );
+          expect(
+            FlutterSkippingGoldenFileComparator.isAvailableForEnvironment(platform),
+            isTrue,
+          );
+        });
         test('returns false - no CI', () {
           platform = FakePlatform(
             environment: <String, String>{
@@ -887,7 +800,7 @@ void main() {
             operatingSystem: 'macos'
           );
           expect(
-            FlutterSkippingFileComparator.isAvailableForEnvironment(
+            FlutterSkippingGoldenFileComparator.isAvailableForEnvironment(
               platform),
             isFalse,
           );
@@ -978,7 +891,7 @@ void main() {
           goldens: mockSkiaClient,
           baseDirectory: mockDirectory,
         );
-        expect(comparator.runtimeType, FlutterSkippingFileComparator);
+        expect(comparator.runtimeType, FlutterSkippingGoldenFileComparator);
 
         when(mockSkiaClient.getExpectations())
           .thenAnswer((_) => throw const SocketException("Can't reach Gold"));
@@ -987,7 +900,7 @@ void main() {
           goldens: mockSkiaClient,
           baseDirectory: mockDirectory,
         );
-        expect(comparator.runtimeType, FlutterSkippingFileComparator);
+        expect(comparator.runtimeType, FlutterSkippingGoldenFileComparator);
       });
     });
   });