Revert "Improve codesign script (#71244)" (#73961)

This reverts commit b7f5aef1.

dev/bots/codesign.dart

@@ -2,24 +2,184 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' as io;
+import 'dart:io';
 import 'package:path/path.dart' as path;
 
-// TODO(fujino): delete this script once PR #71244 lands on stable.
-void main(List<String> args) {
-  final String scriptPath = io.Platform.script.toFilePath();
-  final String scriptDir = path.dirname(scriptPath);
-  final String repoRoot = path.normalize(path.join(scriptDir, '..', '..'));
-  final io.ProcessResult result = io.Process.runSync(
-    path.join(repoRoot, 'dev', 'tools', 'bin', 'conductor'),
-    <String>['codesign', '--verify'],
+String get repoRoot => path.normalize(path.join(path.dirname(Platform.script.toFilePath()), '..', '..'));
+String get cacheDirectory => path.normalize(path.join(repoRoot, 'bin', 'cache'));
+
+/// Check mime-type of file at [filePath] to determine if it is binary
+bool isBinary(String filePath) {
+  final ProcessResult result = Process.runSync(
+    'file',
+    <String>[
+      '--mime-type',
+      '-b', // is binary
+      filePath,
+    ],
+  );
+  return (result.stdout as String).contains('application/x-mach-binary');
+}
+
+/// Find every binary file in the given [rootDirectory]
+List<String> findBinaryPaths([String rootDirectory]) {
+  rootDirectory ??= cacheDirectory;
+  final ProcessResult result = Process.runSync(
+    'find',
+    <String>[
+      rootDirectory,
+      '-type',
+      'f',
+      '-perm',
+      '+111', // is executable
+    ],
+  );
+  final List<String> allFiles = (result.stdout as String).split('\n').where((String s) => s.isNotEmpty).toList();
+  return allFiles.where(isBinary).toList();
+}
+
+/// Given the path to a stamp file, read the contents.
+///
+/// Will throw if the file doesn't exist.
+String readStamp(String filePath) {
+  final File file = File(filePath);
+  if (!file.existsSync()) {
+    throw 'Error! Stamp file $filePath does not exist!';
+  }
+  return file.readAsStringSync().trim();
+}
+
+/// Return whether or not the flutter cache is up to date.
+bool checkCacheIsCurrent() {
+  try {
+    final String dartSdkStamp = readStamp(path.join(cacheDirectory, 'engine-dart-sdk.stamp'));
+    final String engineVersion = readStamp(path.join(repoRoot, 'bin', 'internal', 'engine.version'));
+    return dartSdkStamp == engineVersion;
+  } catch (e) {
+    print(e);
+    return false;
+  }
+}
+
+List<String> get binariesWithEntitlements => List<String>.unmodifiable(<String>[
+  'ideviceinfo',
+  'idevicename',
+  'idevicescreenshot',
+  'idevicesyslog',
+  'libimobiledevice.6.dylib',
+  'libplist.3.dylib',
+  'iproxy',
+  'libusbmuxd.4.dylib',
+  'libssl.1.0.0.dylib',
+  'libcrypto.1.0.0.dylib',
+  'libzip.5.0.dylib',
+  'libzip.5.dylib',
+  'gen_snapshot',
+  'dart',
+  'flutter_tester',
+  'gen_snapshot_arm64',
+  'gen_snapshot_armv7',
+]);
+
+List<String> get expectedEntitlements => List<String>.unmodifiable(<String>[
+  'com.apple.security.cs.allow-jit',
+  'com.apple.security.cs.allow-unsigned-executable-memory',
+  'com.apple.security.cs.allow-dyld-environment-variables',
+  'com.apple.security.network.client',
+  'com.apple.security.network.server',
+  'com.apple.security.cs.disable-library-validation',
+]);
+
+
+/// Check if the binary has the expected entitlements.
+bool hasExpectedEntitlements(String binaryPath) {
+  try {
+    final ProcessResult entitlementResult = Process.runSync(
+      'codesign',
+      <String>[
+        '--display',
+        '--entitlements',
+        ':-',
+        binaryPath,
+      ],
     );
-  if (result.exitCode != 0) {
-    print('codesign script exited with code $result.exitCode');
-    print('stdout:\n${result.stdout}\n');
-    print('stderr:\n${result.stderr}\n');
-    io.exit(1);
-  }
-  print('codesign script succeeded.');
-  print('stdout:\n${result.stdout}');
+
+    if (entitlementResult.exitCode != 0) {
+      print('The `codesign --entitlements` command failed with exit code ${entitlementResult.exitCode}:\n'
+        '${entitlementResult.stderr}\n');
+      return false;
+    }
+
+    bool passes = true;
+    final String output = entitlementResult.stdout as String;
+    for (final String entitlement in expectedEntitlements) {
+      final bool entitlementExpected = binariesWithEntitlements.contains(path.basename(binaryPath));
+      if (output.contains(entitlement) != entitlementExpected) {
+        print('File "$binaryPath" ${entitlementExpected ? 'does not have expected' : 'has unexpected'} entitlement $entitlement.');
+        passes = false;
+      }
+    }
+    return passes;
+  } catch (e) {
+    print(e);
+    return false;
+  }
+}
+
+void main() {
+  if (!Platform.isMacOS) {
+    print('Error! Expected operating system "macos", actual operating system '
+      'is: "${Platform.operatingSystem}"');
+    exit(1);
+  }
+
+  if (!checkCacheIsCurrent()) {
+    print(
+      'Warning! Your cache is either not present or not matching your flutter\n'
+      'version. Run a `flutter` command to update your cache, and re-try this\n'
+      'test.');
+    exit(1);
+  }
+
+  final List<String> unsignedBinaries = <String>[];
+  final List<String> wrongEntitlementBinaries = <String>[];
+  for (final String binaryPath in findBinaryPaths(cacheDirectory)) {
+    print('Verifying the code signature of $binaryPath');
+    final ProcessResult codeSignResult = Process.runSync(
+      'codesign',
+      <String>[
+        '-vvv',
+        binaryPath,
+      ],
+    );
+    if (codeSignResult.exitCode != 0) {
+      unsignedBinaries.add(binaryPath);
+      print('File "$binaryPath" does not appear to be codesigned.\n'
+            'The `codesign` command failed with exit code ${codeSignResult.exitCode}:\n'
+            '${codeSignResult.stderr}\n');
+      continue;
+    } else {
+      print('Verifying entitlements of $binaryPath');
+      if (!hasExpectedEntitlements(binaryPath)) {
+        wrongEntitlementBinaries.add(binaryPath);
+      }
+    }
+  }
+
+  if (unsignedBinaries.isNotEmpty) {
+    print('Found ${unsignedBinaries.length} unsigned binaries:');
+    unsignedBinaries.forEach(print);
+  }
+
+  if (wrongEntitlementBinaries.isNotEmpty) {
+    print('Found ${wrongEntitlementBinaries.length} binaries with unexpected entitlements:');
+    wrongEntitlementBinaries.forEach(print);
+  }
+
+  if (unsignedBinaries.isNotEmpty) {
+    // TODO(jmagman): Also exit if `wrongEntitlementBinaries.isNotEmpty` after https://github.com/flutter/flutter/issues/46704 is done.
+    exit(1);
+  }
+
+  print('Verified that binaries are codesigned and have expected entitlements.');
 }

dev/bots/test.dart

@@ -694,7 +694,7 @@ Future<void> _runFrameworkTests() async {
     await _pubRunTest(path.join(flutterRoot, 'dev', 'bots'), tableData: bigqueryApi?.tabledata);
     await _pubRunTest(path.join(flutterRoot, 'dev', 'devicelab'), tableData: bigqueryApi?.tabledata);
     await _pubRunTest(path.join(flutterRoot, 'dev', 'snippets'), tableData: bigqueryApi?.tabledata);
-    await _pubRunTest(path.join(flutterRoot, 'dev', 'tools'), tableData: bigqueryApi?.tabledata, forceSingleCore: true);
+    await _pubRunTest(path.join(flutterRoot, 'dev', 'tools'), tableData: bigqueryApi?.tabledata);
     await _pubRunTest(path.join(flutterRoot, 'dev', 'benchmarks', 'metrics_center'), tableData: bigqueryApi?.tabledata);
     await _runFlutterTest(path.join(flutterRoot, 'dev', 'integration_tests', 'android_semantics_testing'), tableData: bigqueryApi?.tabledata);
     await _runFlutterTest(path.join(flutterRoot, 'dev', 'manual_tests'), tableData: bigqueryApi?.tabledata);

dev/tools/bin/conductor.dart

@@ -10,17 +10,15 @@
 import 'dart:io' as io;
 
 import 'package:args/command_runner.dart';
-import 'package:dev_tools/codesign.dart';
-import 'package:dev_tools/globals.dart';
-import 'package:dev_tools/roll_dev.dart';
-import 'package:dev_tools/repository.dart';
-import 'package:dev_tools/stdio.dart';
 import 'package:file/file.dart';
 import 'package:file/local.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
+import 'package:dev_tools/repository.dart';
+import 'package:dev_tools/roll_dev.dart';
+import 'package:dev_tools/stdio.dart';
 
-Future<void> main(List<String> args) async {
+void main(List<String> args) {
   const FileSystem fileSystem = LocalFileSystem();
   const ProcessManager processManager = LocalProcessManager();
   const Platform platform = LocalPlatform();
@@ -31,12 +29,9 @@ Future<void> main(List<String> args) async {
   );
   final Checkouts checkouts = Checkouts(
     fileSystem: fileSystem,
-    parentDirectory: localFlutterRoot.parent,
     platform: platform,
     processManager: processManager,
-    stdio: stdio,
   );
-
   final CommandRunner<void> runner = CommandRunner<void>(
     'conductor',
     'A tool for coordinating Flutter releases.',
@@ -44,15 +39,16 @@ Future<void> main(List<String> args) async {
   );
 
   <Command<void>>[
-    RollDevCommand(
-      checkouts: checkouts,
+    RollDev(
+      fileSystem: fileSystem,
+      platform: platform,
+      repository: checkouts.addRepo(
         fileSystem: fileSystem,
         platform: platform,
+        repoType: RepositoryType.framework,
         stdio: stdio,
       ),
-    CodesignCommand(
-      checkouts: checkouts,
-      flutterRoot: localFlutterRoot,
+      stdio: stdio,
     ),
   ].forEach(runner.addCommand);
 
@@ -62,9 +58,20 @@ Future<void> main(List<String> args) async {
   }
 
   try {
-    await runner.run(args);
+    runner.run(args);
   } on Exception catch (e) {
     stdio.printError(e.toString());
     io.exit(1);
   }
 }
+
+bool assertsEnabled() {
+  // Verify asserts enabled
+  bool assertsEnabled = false;
+
+  assert(() {
+    assertsEnabled = true;
+    return true;
+  }());
+  return assertsEnabled;
+}

dev/tools/lib/git.dart

@@ -45,7 +45,6 @@ class Git {
     return processManager.runSync(
       <String>['git', ...args],
       workingDirectory: workingDirectory,
-      environment: <String, String>{'GIT_TRACE': '1'},
     );
   }
 

dev/tools/lib/globals.dart

@@ -2,10 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:file/file.dart';
-import 'package:file/local.dart';
-import 'package:platform/platform.dart';
-
 const String kIncrement = 'increment';
 const String kCommit = 'commit';
 const String kRemoteName = 'remote';
@@ -28,61 +24,3 @@ String stdoutToString(dynamic input) {
   final String str = input as String;
   return str.trim();
 }
-
-class ConductorException implements Exception {
-  ConductorException(this.message);
-
-  final String message;
-
-  @override
-  String toString() => 'Exception: $message';
-}
-
-Directory _flutterRoot;
-Directory get localFlutterRoot {
-  if (_flutterRoot != null) {
-    return _flutterRoot;
-  }
-  String filePath;
-  const FileSystem fileSystem = LocalFileSystem();
-  const Platform platform = LocalPlatform();
-
-  // If a test
-  if (platform.script.scheme == 'data') {
-    final RegExp pattern = RegExp(
-      r'(file:\/\/[^"]*[/\\]dev\/tools[/\\][^"]+\.dart)',
-      multiLine: true,
-    );
-    final Match match =
-        pattern.firstMatch(Uri.decodeFull(platform.script.path));
-    if (match == null) {
-      throw Exception(
-        'Cannot determine path of script!\n${platform.script.path}',
-      );
-    }
-    filePath = Uri.parse(match.group(1)).path.replaceAll(r'%20', ' ');
-  } else {
-    filePath = platform.script.toFilePath();
-  }
-  final String checkoutsDirname = fileSystem.path.normalize(
-    fileSystem.path.join(
-      fileSystem.path.dirname(filePath),
-      '..', // flutter/dev/tools
-      '..', // flutter/dev
-      '..', // flutter
-    ),
-  );
-  _flutterRoot = fileSystem.directory(checkoutsDirname);
-  return _flutterRoot;
-}
-
-bool assertsEnabled() {
-  // Verify asserts enabled
-  bool assertsEnabled = false;
-
-  assert(() {
-    assertsEnabled = true;
-    return true;
-  }());
-  return assertsEnabled;
-}

dev/tools/lib/roll_dev.dart

@@ -14,12 +14,12 @@ import './stdio.dart';
 import './version.dart';
 
 /// Create a new dev release without cherry picks.
-class RollDevCommand extends Command<void> {
-  RollDevCommand({
-    @required this.checkouts,
-    @required this.fileSystem,
-    @required this.platform,
-    @required this.stdio,
+class RollDev extends Command<void> {
+  RollDev({
+    this.fileSystem,
+    this.platform,
+    this.repository,
+    this.stdio,
   }) {
     argParser.addOption(
       kIncrement,
@@ -60,10 +60,10 @@ class RollDevCommand extends Command<void> {
     argParser.addFlag(kYes, negatable: false, abbr: 'y', help: 'Skip the confirmation prompt.');
   }
 
-  final Checkouts checkouts;
   final FileSystem fileSystem;
   final Platform platform;
   final Stdio stdio;
+  final Repository repository;
 
   @override
   String get name => 'roll-dev';
@@ -76,7 +76,9 @@ class RollDevCommand extends Command<void> {
   void run() {
     rollDev(
       argResults: argResults,
-      repository: FrameworkRepository(checkouts),
+      fileSystem: fileSystem,
+      platform: platform,
+      repository: repository,
       stdio: stdio,
       usage: argParser.usage,
     );
@@ -91,7 +93,9 @@ bool rollDev({
   @required String usage,
   @required ArgResults argResults,
   @required Stdio stdio,
-  @required FrameworkRepository repository,
+  @required Platform platform,
+  @required FileSystem fileSystem,
+  @required Repository repository,
   String remoteName = 'origin',
 }) {
   final String level = argResults[kIncrement] as String;

dev/tools/lib/stdio.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io' as io;
+import 'dart:io';
 
 import 'package:meta/meta.dart';
 
@@ -31,15 +31,9 @@ class VerboseStdio extends Stdio {
     @required this.stdin,
   }) : assert(stdout != null), assert(stderr != null), assert(stdin != null);
 
-  factory VerboseStdio.local() => VerboseStdio(
-    stdout: io.stdout,
-    stderr: io.stderr,
-    stdin: io.stdin,
-  );
-
-  final io.Stdout stdout;
-  final io.Stdout stderr;
-  final io.Stdin stdin;
+  final Stdout stdout;
+  final Stdout stderr;
+  final Stdin stdin;
 
   @override
   void printError(String message) {

dev/tools/test/codesign_integration_test.dart

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:args/command_runner.dart';
-import 'package:file/file.dart';
-import 'package:file/local.dart';
-import 'package:platform/platform.dart';
-import 'package:process/process.dart';
-
-import 'package:dev_tools/codesign.dart' show CodesignCommand;
-import 'package:dev_tools/globals.dart';
-import 'package:dev_tools/repository.dart' show Checkouts;
-
-import './common.dart';
-
-/// Verify all binaries in the Flutter cache are expected by Conductor.
-void main() {
-  test(
-      'validate the expected binaries from the conductor codesign command are present in the cache',
-      () async {
-    const Platform platform = LocalPlatform();
-    const FileSystem fileSystem = LocalFileSystem();
-    const ProcessManager processManager = LocalProcessManager();
-    final TestStdio stdio = TestStdio(verbose: true);
-    final Checkouts checkouts = Checkouts(
-      fileSystem: fileSystem,
-      parentDirectory: localFlutterRoot.parent,
-      platform: platform,
-      processManager: processManager,
-      stdio: stdio,
-    );
-
-    final CommandRunner<void> runner = CommandRunner<void>('codesign-test', '')
-      ..addCommand(
-          CodesignCommand(checkouts: checkouts, flutterRoot: localFlutterRoot));
-
-    try {
-      await runner.run(<String>[
-        'codesign',
-        '--verify',
-        // Only verify if the correct binaries are in the cache
-        '--no-signatures',
-      ]);
-    } on ConductorException catch (e) {
-      print(fixItInstructions);
-      fail(e.message);
-    } on Exception {
-      print('stdout:\n${stdio.stdout}');
-      print('stderr:\n${stdio.error}');
-      rethrow;
-    }
-  }, onPlatform: <String, dynamic>{
-    'windows': const Skip('codesign command is only supported on macos'),
-    'linux': const Skip('codesign command is only supported on macos'),
-  });
-}
-
-const String fixItInstructions = '''
-Codesign integration test failed.
-
-This means that the binary files found in the Flutter cache do not match those
-expected by the conductor tool (either an expected file was not found in the
-cache or an unexpected file was found in the cache).
-
-This usually happens either during an engine roll or a change to the caching
-logic in flutter_tools. If this is a valid change, then the conductor source
-code should be updated, specifically either the [binariesWithEntitlements] or
-[binariesWithoutEntitlements] lists, depending on if the file should have macOS
-entitlements applied during codesigning.
-''';

dev/tools/test/common.dart

@@ -4,7 +4,6 @@
 
 import 'dart:io';
 
-import 'package:file/file.dart';
 import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
 import 'package:test/test.dart' as test_package show TypeMatcher;
 

dev/tools/test/roll_dev_integration_test.dart

@@ -7,7 +7,6 @@ import 'package:file/local.dart';
 import 'package:platform/platform.dart';
 import 'package:process/process.dart';
 
-import 'package:dev_tools/globals.dart';
 import 'package:dev_tools/roll_dev.dart' show rollDev;
 import 'package:dev_tools/repository.dart';
 import 'package:dev_tools/version.dart';
@@ -23,8 +22,8 @@ void main() {
     const String usageString = 'Usage: flutter conductor.';
 
     Checkouts checkouts;
-    FrameworkRepository frameworkUpstream;
-    FrameworkRepository framework;
+    Repository frameworkUpstream;
+    Repository framework;
 
     setUp(() {
       platform = const LocalPlatform();
@@ -33,20 +32,22 @@ void main() {
       stdio = TestStdio(verbose: true);
       checkouts = Checkouts(
         fileSystem: fileSystem,
-        parentDirectory: localFlutterRoot.parent,
         platform: platform,
         processManager: processManager,
-        stdio: stdio,
       );
 
-      frameworkUpstream = FrameworkRepository(checkouts, localUpstream: true);
+      frameworkUpstream = checkouts.addRepo(
+        repoType: RepositoryType.framework,
+        name: 'framework-upstream',
+        stdio: stdio,
+        platform: platform,
+        localUpstream: true,
+        fileSystem: fileSystem,
+        useExistingCheckout: false,
+      );
 
       // This repository has [frameworkUpstream] set as its push/pull remote.
-      framework = FrameworkRepository(
-        checkouts,
-        name: 'test-framework',
-        upstream: 'file://${frameworkUpstream.checkoutDirectory.path}/',
-      );
+      framework = frameworkUpstream.cloneRepository('test-framework');
     });
 
     test('increment m', () {
@@ -67,6 +68,8 @@ void main() {
           usage: usageString,
           argResults: fakeArgResults,
           stdio: stdio,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: framework,
         ),
         true,
@@ -104,6 +107,8 @@ void main() {
           usage: usageString,
           argResults: fakeArgResults,
           stdio: stdio,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: framework,
         ),
         true,

dev/tools/test/roll_dev_test.dart

@@ -24,7 +24,7 @@ void main() {
     FakeArgResults fakeArgResults;
     MemoryFileSystem fileSystem;
     TestStdio stdio;
-    FrameworkRepository repo;
+    Repository repo;
     Checkouts checkouts;
     FakePlatform platform;
     FakeProcessManager processManager;
@@ -39,9 +39,12 @@ void main() {
         parentDirectory: fileSystem.directory(checkoutsParentDirectory),
         platform: platform,
         processManager: processManager,
+      );
+      repo = checkouts.addRepo(
+        platform: platform,
+        repoType: RepositoryType.framework,
         stdio: stdio,
       );
-      repo = FrameworkRepository(checkouts);
     });
 
     test('returns false if level not provided', () {
@@ -53,6 +56,8 @@ void main() {
       expect(
         rollDev(
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
           usage: usage,
@@ -70,6 +75,8 @@ void main() {
       expect(
         rollDev(
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
           usage: usage,
@@ -85,13 +92,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -113,6 +115,8 @@ void main() {
       try {
         rollDev(
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
           usage: usage,
@@ -133,13 +137,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -188,6 +187,8 @@ void main() {
         rollDev(
           usage: usage,
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
         ),
@@ -205,13 +206,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -271,6 +267,8 @@ void main() {
         () => rollDev(
           usage: usage,
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
         ),
@@ -285,13 +283,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -340,6 +333,8 @@ void main() {
         () => rollDev(
           usage: usage,
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
         ),
@@ -358,13 +353,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -420,6 +410,8 @@ void main() {
       expect(
         () => rollDev(
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
           usage: usage,
@@ -435,13 +427,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -514,6 +501,8 @@ void main() {
         rollDev(
           usage: usage,
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
         ),
@@ -528,13 +517,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -611,6 +595,8 @@ void main() {
         rollDev(
           usage: usage,
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
         ),
@@ -625,13 +611,8 @@ void main() {
           'clone',
           '--',
           kUpstreamRemote,
-          '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
+          '${checkoutsParentDirectory}checkouts/framework',
         ]),
-        const FakeCommand(command: <String>[
-          'git',
-          'rev-parse',
-          'HEAD',
-        ], stdout: commit),
         const FakeCommand(command: <String>[
           'git',
           'remote',
@@ -703,6 +684,8 @@ void main() {
       expect(
         rollDev(
           argResults: fakeArgResults,
+          fileSystem: fileSystem,
+          platform: platform,
           repository: repo,
           stdio: stdio,
           usage: usage,