[flutter_tools] Remove more shuffles (#107759)

engine-flutter-autoroll · Jul 26, 2022 · b035ef1 · b035ef1
1 parent 4056d3f
commit b035ef1
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 53 deletions.
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart
@@ -4,12 +4,6 @@
 
 // @dart = 2.8
 
-// TODO(gspencergoog): Remove this tag once this test's state leaks/test
-// dependencies have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=20210722"
-@Tags(<String>['no-shuffle'])
-
 import 'package:args/command_runner.dart';
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
@@ -35,6 +29,8 @@ void main() {
   Cache.disableLocking();
   Directory tempDir;
   FakeBundleBuilder fakeBundleBuilder;
+  final FileSystemStyle fileSystemStyle = globals.fs.path.separator == '/' ?
+    FileSystemStyle.posix : FileSystemStyle.windows;
 
   setUp(() {
     tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_tools_packages_test.');
@@ -46,6 +42,10 @@ void main() {
     tryToDelete(tempDir);
   });
 
+  MemoryFileSystem fsFactory() {
+    return MemoryFileSystem.test(style: fileSystemStyle);
+  }
+
   Future<BuildBundleCommand> runCommandIn(String projectPath, { List<String> arguments }) async {
     final BuildBundleCommand command = BuildBundleCommand(bundleBuilder: fakeBundleBuilder);
     final CommandRunner<void> runner = createTestCommandRunner(command);
@@ -86,7 +86,7 @@ void main() {
   });
 
   testUsingContext('bundle fails to build for Windows if feature is disabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync(recursive: true);
     globals.fs.file('.packages').createSync(recursive: true);
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -97,13 +97,13 @@ void main() {
       '--target-platform=windows-x64',
     ]), throwsToolExit());
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(),
   });
 
   testUsingContext('bundle fails to build for Linux if feature is disabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -114,13 +114,13 @@ void main() {
       '--target-platform=linux-x64',
     ]), throwsToolExit());
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(),
   });
 
   testUsingContext('bundle fails to build for macOS if feature is disabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -131,13 +131,13 @@ void main() {
       '--target-platform=darwin',
     ]), throwsToolExit());
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(),
   });
 
   testUsingContext('bundle --tree-shake-icons fails', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -149,12 +149,12 @@ void main() {
       '--tree-shake-icons',
     ]), throwsToolExit(message: 'tree-shake-icons'));
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('bundle can build for Windows if feature is enabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -165,13 +165,13 @@ void main() {
       '--target-platform=windows-x64',
     ]);
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(isWindowsEnabled: true),
   });
 
   testUsingContext('bundle can build for Linux if feature is enabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -182,13 +182,13 @@ void main() {
       '--target-platform=linux-x64',
     ]);
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: true),
   });
 
   testUsingContext('bundle can build for macOS if feature is enabled', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand(bundleBuilder: FakeBundleBuilder()));
@@ -199,13 +199,13 @@ void main() {
       '--target-platform=darwin',
     ]);
   }, overrides: <Type, Generator>{
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
     FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true),
   });
 
   testUsingContext('passes track widget creation through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -230,12 +230,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes dart-define through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -261,12 +261,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes filesystem-scheme through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -291,12 +291,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes filesystem-roots through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -322,12 +322,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes extra frontend-options through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -353,12 +353,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes extra gen_snapshot-options through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -384,12 +384,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes profile options through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -423,12 +423,12 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 
   testUsingContext('passes release options through', () async {
-    globals.fs.file('lib/main.dart').createSync(recursive: true);
+    globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file('.packages').createSync();
     final CommandRunner<void> runner = createTestCommandRunner(BuildBundleCommand());
@@ -462,7 +462,7 @@ void main() {
         kDartObfuscation: 'false',
       });
     }),
-    FileSystem: () => MemoryFileSystem.test(),
+    FileSystem: fsFactory,
     ProcessManager: () => FakeProcessManager.any(),
   });
 }

diff --git a/...es/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_test.dart b/...es/flutter_tools/test/general.shard/build_system/targets/dart_plugin_registrant_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
-// dependencies have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=20210722"
-@Tags(<String>['no-shuffle'])
-
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
@@ -99,7 +93,11 @@ environment:
 void main() {
 
   group('Dart plugin registrant' , () {
-    final FileSystem fileSystem = MemoryFileSystem.test();
+    late FileSystem fileSystem;
+
+    setUp(() {
+      fileSystem = MemoryFileSystem.test();
+    });
 
     testWithoutContext('skipped based on environment.generateDartPluginRegistry',
         () async {
@@ -123,6 +121,7 @@ void main() {
 
       expect(const DartPluginRegistrantTarget().canSkip(environment2), isFalse);
     });
+
     testWithoutContext('skipped based on platform', () async {
       const Map<String, bool> canSkip = <String, bool>{
         'darwin-x64': false,
@@ -334,7 +333,8 @@ void main() {
       projectDir
           .childDirectory('.dart_tool')
           .childFile('package_config.json')
-          .writeAsStringSync(_kSamplePackageJson);
+          ..createSync(recursive: true)
+          ..writeAsStringSync(_kSamplePackageJson);
 
       projectDir.childFile('pubspec.yaml').writeAsStringSync(_kSamplePubspecFile);
 
@@ -345,7 +345,8 @@ void main() {
       environment.fileSystem.currentDirectory
           .childDirectory('path_provider_linux')
           .childFile('pubspec.yaml')
-          .writeAsStringSync(_kSamplePluginPubspec);
+          ..createSync(recursive: true)
+          ..writeAsStringSync(_kSamplePluginPubspec);
 
       final FlutterProject testProject = FlutterProject.fromDirectoryTest(projectDir);
       await DartPluginRegistrantTarget.test(testProject).build(environment);

diff --git a/packages/flutter_tools/test/general.shard/channel_test.dart b/packages/flutter_tools/test/general.shard/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
-// dependencies have been fixed.
-// https://github.com/flutter/flutter/issues/85160
-// Fails with "flutter test --test-randomize-ordering-seed=20210723"
-@Tags(<String>['no-shuffle'])
-
 import 'package:args/command_runner.dart';
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
@@ -33,6 +27,9 @@ void main() {
     });
 
     Future<void> simpleChannelTest(List<String> args) async {
+      fakeProcessManager.addCommands(const <FakeCommand>[
+        FakeCommand(command: <String>['git', 'branch', '-r'], stdout: '  branch-1\n  branch-2'),
+      ]);
       final ChannelCommand command = ChannelCommand();
       final CommandRunner<void> runner = createTestCommandRunner(command);
       await runner.run(args);
@@ -48,10 +45,16 @@ void main() {
 
     testUsingContext('list', () async {
       await simpleChannelTest(<String>['channel']);
+    }, overrides: <Type, Generator>{
+      ProcessManager: () => fakeProcessManager,
+      FileSystem: () => MemoryFileSystem.test(),
     });
 
     testUsingContext('verbose list', () async {
       await simpleChannelTest(<String>['channel', '-v']);
+    }, overrides: <Type, Generator>{
+      ProcessManager: () => fakeProcessManager,
+      FileSystem: () => MemoryFileSystem.test(),
     });
 
     testUsingContext('sorted by stability', () async {

diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart
@@ -122,7 +122,6 @@ void testUsingContext(
           TemplateRenderer: () => const MustacheTemplateRenderer(),
         },
         body: () {
-          final String flutterRoot = getFlutterRoot();
           return runZonedGuarded<Future<dynamic>>(() {
             try {
               return context.run<dynamic>(
@@ -134,7 +133,7 @@ void testUsingContext(
                   if (initializeFlutterRoot) {
                     // Provide a sane default for the flutterRoot directory. Individual
                     // tests can override this either in the test or during setup.
-                    Cache.flutterRoot ??= flutterRoot;
+                    Cache.flutterRoot ??= getFlutterRoot();
                   }
                   return await testMethod();
                 },