Revert "Randomize Framework tests, opt out some tests that currently fail. (#85159)" (#85673)

This reverts commit b5f9612 because it is taking about 40% longer to run the tests, which is causing timeouts.

dev/bots/run_command.dart

@@ -22,7 +22,6 @@ Stream<String> runAndGetStdout(String executable, List<String> arguments, {
   String workingDirectory,
   Map<String, String> environment,
   bool expectNonZeroExit = false,
-  bool expectNoTests = false,
 }) async* {
   final StreamController<String> output = StreamController<String>();
   final Future<CommandResult> command = runCommand(
@@ -31,7 +30,6 @@ Stream<String> runAndGetStdout(String executable, List<String> arguments, {
     workingDirectory: workingDirectory,
     environment: environment,
     expectNonZeroExit: expectNonZeroExit,
-    expectNoTests: expectNoTests,
     // Capture the output so it's not printed to the console by default.
     outputMode: OutputMode.capture,
     outputListener: (String line, io.Process process) {
@@ -115,8 +113,7 @@ Future<Command> startCommand(String executable, List<String> arguments, {
     environment: environment,
   );
 
-  Future<List<List<int>>> savedStdout = Future<List<List<int>>>.value(<List<int>>[]);
+  Future<List<List<int>>> savedStdout, savedStderr;
-  Future<List<List<int>>> savedStderr = Future<List<List<int>>>.value(<List<int>>[]);
   final Stream<List<int>> stdoutSource = process.stdout
     .transform<String>(const Utf8Decoder())
     .transform(const LineSplitter())
@@ -131,14 +128,8 @@ Future<Command> startCommand(String executable, List<String> arguments, {
     .transform(const Utf8Encoder());
   switch (outputMode) {
     case OutputMode.print:
-      stdoutSource.listen((List<int> output) {
+      stdoutSource.listen(io.stdout.add);
-        io.stdout.add(output);
+      process.stderr.listen(io.stderr.add);
-        savedStdout.then((List<List<int>> list) => list.add(output));
-      });
-      process.stderr.listen((List<int> output) {
-        io.stderr.add(output);
-        savedStdout.then((List<List<int>> list) => list.add(output));
-      });
       break;
     case OutputMode.capture:
       savedStdout = stdoutSource.toList();
@@ -167,7 +158,6 @@ Future<CommandResult> runCommand(String executable, List<String> arguments, {
   String workingDirectory,
   Map<String, String> environment,
   bool expectNonZeroExit = false,
-  bool expectNoTests = false,
   int expectedExitCode,
   String failureMessage,
   OutputMode outputMode = OutputMode.print,
@@ -192,21 +182,7 @@ Future<CommandResult> runCommand(String executable, List<String> arguments, {
 
   final CommandResult result = await command.onExit;
 
-  // Currently, the test infrastructure fails if it doesn't find any tests to
+  if ((result.exitCode == 0) == expectNonZeroExit || (expectedExitCode != null && result.exitCode != expectedExitCode)) {
-  // run, but in the case of tests tagged as "no-shuffle", there might either be
-  // none that can be shuffled, or none that shouldn't be shuffled, and since
-  // we're running it twice to get all the tests in either category, it
-  // shouldn't fail if no tests are run.
-  //
-  // TODO(gspencergoog): This is a workaround until
-  // https://github.com/dart-lang/test/issues/1546 is addressed. Remove the
-  // workaround (parsing the test output) when/if that issue is fixed.
-  final bool skipErrorExit = expectNoTests &&
-      result != null &&
-      result.flattenedStdout != null &&
-      result.flattenedStdout.trimRight().endsWith('No tests ran.');
-
-  if (!skipErrorExit && ((result.exitCode == 0) == expectNonZeroExit || (expectedExitCode != null && result.exitCode != expectedExitCode))) {
     // Print the output when we get unexpected results (unless output was
     // printed already).
     switch (outputMode) {

dev/bots/test.dart

@@ -620,7 +620,6 @@ Future<void> _runFrameworkTests() async {
         path.join(flutterRoot, 'packages', 'flutter'),
         options: <String>[trackWidgetCreationOption, ...soundNullSafetyOptions],
         tests: <String>[ path.join('test', 'widgets') + path.separator ],
-        shuffleOrder: true,
       );
     }
     // Try compiling code outside of the packages/flutter directory with and without --track-widget-creation
@@ -628,7 +627,6 @@ Future<void> _runFrameworkTests() async {
       await _runFlutterTest(
         path.join(flutterRoot, 'dev', 'integration_tests', 'flutter_gallery'),
         options: <String>[trackWidgetCreationOption],
-        shuffleOrder: true,
       );
     }
     // Run release mode tests (see packages/flutter/test_release/README.md)
@@ -636,7 +634,6 @@ Future<void> _runFrameworkTests() async {
       path.join(flutterRoot, 'packages', 'flutter'),
       options: <String>['--dart-define=dart.vm.product=true', ...soundNullSafetyOptions],
       tests: <String>['test_release${path.separator}'],
-      shuffleOrder: true,
     );
   }
 
@@ -653,7 +650,6 @@ Future<void> _runFrameworkTests() async {
         path.join(flutterRoot, 'packages', 'flutter'),
         options: <String>[trackWidgetCreationOption, ...soundNullSafetyOptions],
         tests: tests,
-        shuffleOrder: true,
       );
     }
   }
@@ -1380,18 +1376,6 @@ Future<void> _pubRunTest(String workingDirectory, {
   }
 }
 
-// Used as an argument to the runTests internal function in the _runFlutterTest
-// function.
-enum _ShuffleMode {
-  // Runs only the tests not tagged with "no-shuffle" in a shuffled order.
-  shuffled,
-  // Runs only the tests that would fail if shuffled (those tagged with
-  // "no-shuffle").
-  unshuffled,
-  // Runs all tests without shuffling.
-  sequential,
-}
-
 Future<void> _runFlutterTest(String workingDirectory, {
   String script,
   bool expectFailure = false,
@@ -1399,20 +1383,20 @@ Future<void> _runFlutterTest(String workingDirectory, {
   OutputChecker outputChecker,
   List<String> options = const <String>[],
   bool skip = false,
-  bool shuffleOrder = false,
   Map<String, String> environment,
   List<String> tests = const <String>[],
 }) async {
   assert(!printOutput || outputChecker == null, 'Output either can be printed or checked but not both');
 
-  final List<String> testArgs = <String>[
+  final List<String> args = <String>[
+    'test',
     ...options,
     ...?flutterTestArgs,
   ];
 
   final bool shouldProcessOutput = useFlutterTestFormatter && !expectFailure && !options.contains('--coverage');
   if (shouldProcessOutput)
-    testArgs.add('--machine');
+    args.add('--machine');
 
   if (script != null) {
     final String fullScriptPath = path.join(workingDirectory, script);
@@ -1426,39 +1410,11 @@ Future<void> _runFlutterTest(String workingDirectory, {
         print('This is one of the tests that is normally skipped in this configuration.');
       exit(1);
     }
-    testArgs.add(script);
+    args.add(script);
   }
 
-  testArgs.addAll(tests);
+  args.addAll(tests);
 
-  Future<void> runTests(_ShuffleMode shuffleMode) async {
-    int seed = 0;
-    final List<String> shuffleArgs = <String>[];
-    switch (shuffleMode) {
-      case _ShuffleMode.shuffled:
-        final DateTime now = DateTime.now();
-        // Generates YYYYMMDD as the seed, so that testing continues to fail on the
-        // day it was originally run, and on other days the seed can be used to
-        // replicate failures.
-        seed = now.year * 10000 + now.month * 100 + now.day;
-        print('Shuffling test order using arbitrary daily seed $seed.');
-        print('To run locally, run "flutter test -x no-shuffle --test-randomize-ordering-seed=$seed '
-            '&& flutter test -t no-shuffle" to run all tests (the latter part runs all the tests that '
-            "currently don't work when shuffled, the former skips those tests and shuffles the order "
-            'of the remaining tests).');
-        shuffleArgs.addAll(<String>['-x', 'no-shuffle', '--test-randomize-ordering-seed=$seed']);
-        break;
-      case _ShuffleMode.unshuffled:
-        shuffleArgs.addAll(<String>['-t', 'no-shuffle']);
-        break;
-      case _ShuffleMode.sequential:
-        break;
-    }
-    final List<String> args = <String>[
-      'test',
-      ...shuffleArgs,
-      ...testArgs,
-    ];
   if (!shouldProcessOutput) {
     final OutputMode outputMode = outputChecker == null && printOutput
       ? OutputMode.print
@@ -1469,11 +1425,11 @@ Future<void> _runFlutterTest(String workingDirectory, {
       args,
       workingDirectory: workingDirectory,
       expectNonZeroExit: expectFailure,
-        expectNoTests: shuffleMode == _ShuffleMode.unshuffled,
       outputMode: outputMode,
       skip: skip,
       environment: environment,
     );
+
     if (outputChecker != null) {
       final String message = outputChecker(result);
       if (message != null)
@@ -1491,7 +1447,6 @@ Future<void> _runFlutterTest(String workingDirectory, {
         args,
         workingDirectory: workingDirectory,
         expectNonZeroExit: expectFailure,
-          expectNoTests: shuffleMode == _ShuffleMode.unshuffled,
         environment: environment,
       );
     } finally {
@@ -1504,21 +1459,8 @@ Future<void> _runFlutterTest(String workingDirectory, {
       args,
       workingDirectory: workingDirectory,
       expectNonZeroExit: expectFailure,
-        expectNoTests: shuffleMode == _ShuffleMode.unshuffled,
     );
   }
-  }
-
-  if (shuffleOrder) {
-    // Runs only the tests not tagged with "no-shuffle" in a shuffled order.
-    await runTests(_ShuffleMode.shuffled);
-    // Runs only the tests that would fail if shuffled (those tagged with
-    // "no-shuffle").
-    await runTests(_ShuffleMode.unshuffled);
-  } else {
-    // Runs all tests without shuffling.
-    await runTests(_ShuffleMode.sequential);
-  }
 }
 
 Map<String, String> _initGradleEnvironment() {

packages/flutter/dart_test.yaml

@@ -1,4 +0,0 @@
-tags:
-  # This tag tells the test framework to not shuffle the test order according to
-  # the --test-randomize-ordering-seed for the suites that have this tag.
-  no-shuffle:

packages/flutter/test/animation/animation_controller_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';

packages/flutter/test/cupertino/action_sheet_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 

packages/flutter/test/cupertino/date_picker_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';

packages/flutter/test/cupertino/nav_bar_transition_test.dart

@@ -3,12 +3,6 @@
 // found in the LICENSE file.
 
 @TestOn('!chrome')
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/cupertino/text_field_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, Color;
 
 import 'package:flutter/cupertino.dart';

packages/flutter/test/foundation/service_extensions_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:ui' as ui;

packages/flutter/test/gestures/debug_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/gestures/long_press_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/gestures.dart';
 import 'package:flutter_test/flutter_test.dart';
 

packages/flutter/test/gestures/tap_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=1000"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/material/app_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

packages/flutter/test/material/dropdown_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=1408669812"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:math' as math;
 import 'dart:ui' show window;
 

packages/flutter/test/material/paginated_data_table_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=1000"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';

packages/flutter/test/material/progress_indicator_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';

packages/flutter/test/material/scaffold_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart';

packages/flutter/test/material/scrollbar_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=382757700"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:ui' as ui;
 
 import 'package:flutter/cupertino.dart';

packages/flutter/test/material/text_field_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=3890307731"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:math' as math;
 import 'dart:ui' as ui show window, BoxHeightStyle, BoxWidthStyle;
 

packages/flutter/test/painting/image_stream_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ui';

packages/flutter/test/physics/newton_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/physics.dart';
 import 'package:flutter/widgets.dart';

packages/flutter/test/rendering/editable_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=20210704"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:io' show Platform;
 
 import 'package:flutter/foundation.dart';

packages/flutter/test/rendering/viewport_test.dart

@@ -7,12 +7,6 @@
 // initialize a binding, which rendering_tester will attempt to re-initialize
 // (or vice versa).
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';

packages/flutter/test/scheduler/scheduler_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:async';
 import 'dart:ui' show window;
 

packages/flutter/test/scheduler/ticker_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=4281596210"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';

packages/flutter/test/services/platform_channel_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 

packages/flutter/test/widgets/app_overrides_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 

packages/flutter/test/widgets/binding_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=382757700"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';

packages/flutter/test/widgets/clip_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/widgets/debug_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/widgets/dismissible_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';

packages/flutter/test/widgets/draggable_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';

packages/flutter/test/widgets/platform_view_test.dart

@@ -3,12 +3,6 @@
 // found in the LICENSE file.
 
 @TestOn('!chrome')
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=4281596210"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ui';

packages/flutter/test/widgets/routes_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:collection';
 
 import 'package:flutter/material.dart';

packages/flutter/test/widgets/scroll_aware_image_provider_test.dart

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=123"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:ui' as ui show Image;
 
 import 'package:flutter/widgets.dart';

packages/flutter/test/widgets/widget_inspector_test.dart

@@ -3,13 +3,6 @@
 // found in the LICENSE file.
 
 @TestOn('!chrome')
-
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependency have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=456"
-@Tags(<String>['no-shuffle'])
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
@@ -1990,7 +1983,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
       _CreationLocation location = knownLocations[id]!;
       expect(location.file, equals(file));
       // ClockText widget.
-      expect(location.line, equals(60));
+      expect(location.line, equals(53));
       expect(location.column, equals(9));
       expect(location.name, equals('ClockText'));
       expect(count, equals(1));
@@ -2000,7 +1993,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
       location = knownLocations[id]!;
       expect(location.file, equals(file));
       // Text widget in _ClockTextState build method.
-      expect(location.line, equals(98));
+      expect(location.line, equals(91));
       expect(location.column, equals(12));
       expect(location.name, equals('Text'));
       expect(count, equals(1));
@@ -2027,7 +2020,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
       location = knownLocations[id]!;
       expect(location.file, equals(file));
       // ClockText widget.
-      expect(location.line, equals(60));
+      expect(location.line, equals(53));
       expect(location.column, equals(9));
       expect(location.name, equals('ClockText'));
       expect(count, equals(3)); // 3 clock widget instances rebuilt.
@@ -2037,7 +2030,7 @@ class _TestWidgetInspectorService extends TestWidgetInspectorService {
       location = knownLocations[id]!;
       expect(location.file, equals(file));
       // Text widget in _ClockTextState build method.
-      expect(location.line, equals(98));
+      expect(location.line, equals(91));
       expect(location.column, equals(12));
       expect(location.name, equals('Text'));
       expect(count, equals(3)); // 3 clock widget instances rebuilt.