Unverified Commit 21f40962 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Revert: Update prepare_package.dart to use the process_runner package instead...

Revert: Update prepare_package.dart to use the process_runner package instead having duplicate code. #62710 (#63608)

This reverts #62710, since it has a noSuchMethodError in some circumstances.

This isn't just a straight git revert, because I had to resolve the conflicts in the reverted pubspec.yaml files and re-run flutter update-packages --force-upgrade to make the checksums match.
parent bd1a58a9
This diff is collapsed.
...@@ -18,7 +18,6 @@ dependencies: ...@@ -18,7 +18,6 @@ dependencies:
path: 1.8.0-nullsafety path: 1.8.0-nullsafety
platform: 2.2.1 platform: 2.2.1
process: 3.0.13 process: 3.0.13
process_runner: 2.0.4
test: 1.16.0-nullsafety.1 test: 1.16.0-nullsafety.1
_discoveryapis_commons: 0.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" _discoveryapis_commons: 0.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
...@@ -78,4 +77,4 @@ dev_dependencies: ...@@ -78,4 +77,4 @@ dev_dependencies:
mockito: 4.1.1 mockito: 4.1.1
test_api: 0.2.19-nullsafety test_api: 0.2.19-nullsafety
# PUBSPEC CHECKSUM: 52ec # PUBSPEC CHECKSUM: d9a1
...@@ -9,7 +9,6 @@ import 'dart:typed_data'; ...@@ -9,7 +9,6 @@ import 'dart:typed_data';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:process_runner/process_runner.dart';
import 'package:platform/platform.dart' show FakePlatform; import 'package:platform/platform.dart' show FakePlatform;
import '../prepare_package.dart'; import '../prepare_package.dart';
...@@ -21,15 +20,15 @@ void main() { ...@@ -21,15 +20,15 @@ void main() {
test('Throws on missing executable', () async { test('Throws on missing executable', () async {
// Uses a *real* process manager, since we want to know what happens if // Uses a *real* process manager, since we want to know what happens if
// it can't find an executable. // it can't find an executable.
final ProcessRunner processRunner = ProcessRunner(printOutputDefault: false); final ProcessRunner processRunner = ProcessRunner(subprocessOutput: false);
expect( expect(
expectAsync1((List<String> commandLine) async { expectAsync1((List<String> commandLine) async {
return processRunner.runProcess(commandLine); return processRunner.runProcess(commandLine);
})(<String>['this_executable_better_not_exist_2857632534321']), })(<String>['this_executable_better_not_exist_2857632534321']),
throwsA(isA<ProcessRunnerException>())); throwsA(isA<PreparePackageException>()));
try { try {
await processRunner.runProcess(<String>['this_executable_better_not_exist_2857632534321']); await processRunner.runProcess(<String>['this_executable_better_not_exist_2857632534321']);
} on ProcessRunnerException catch (e) { } on PreparePackageException catch (e) {
expect( expect(
e.message, e.message,
contains('Invalid argument(s): Cannot find executable for this_executable_better_not_exist_2857632534321.'), contains('Invalid argument(s): Cannot find executable for this_executable_better_not_exist_2857632534321.'),
...@@ -50,8 +49,8 @@ void main() { ...@@ -50,8 +49,8 @@ void main() {
'echo test': <ProcessResult>[ProcessResult(0, 0, 'output', 'error')], 'echo test': <ProcessResult>[ProcessResult(0, 0, 'output', 'error')],
}; };
final ProcessRunner processRunner = ProcessRunner( final ProcessRunner processRunner = ProcessRunner(
printOutputDefault: false, processManager: fakeProcessManager); subprocessOutput: false, platform: platform, processManager: fakeProcessManager);
final String output = (await processRunner.runProcess(<String>['echo', 'test'])).stdout; final String output = await processRunner.runProcess(<String>['echo', 'test']);
expect(output, equals('output')); expect(output, equals('output'));
}); });
test('Throws on process failure', () async { test('Throws on process failure', () async {
...@@ -60,12 +59,12 @@ void main() { ...@@ -60,12 +59,12 @@ void main() {
'echo test': <ProcessResult>[ProcessResult(0, -1, 'output', 'error')], 'echo test': <ProcessResult>[ProcessResult(0, -1, 'output', 'error')],
}; };
final ProcessRunner processRunner = ProcessRunner( final ProcessRunner processRunner = ProcessRunner(
printOutputDefault: false, processManager: fakeProcessManager); subprocessOutput: false, platform: platform, processManager: fakeProcessManager);
expect( expect(
expectAsync1((List<String> commandLine) async { expectAsync1((List<String> commandLine) async {
return processRunner.runProcess(commandLine); return processRunner.runProcess(commandLine);
})(<String>['echo', 'test']), })(<String>['echo', 'test']),
throwsA(isA<ProcessRunnerException>())); throwsA(isA<PreparePackageException>()));
}); });
}); });
group('ArchiveCreator for $platformName', () { group('ArchiveCreator for $platformName', () {
...@@ -188,7 +187,7 @@ void main() { ...@@ -188,7 +187,7 @@ void main() {
'git reset --hard $testRef': <ProcessResult>[ProcessResult(0, -1, 'output2', '')], 'git reset --hard $testRef': <ProcessResult>[ProcessResult(0, -1, 'output2', '')],
}; };
processManager.fakeResults = calls; processManager.fakeResults = calls;
expect(expectAsync0(creator.initializeRepo), throwsA(isA<ProcessRunnerException>())); expect(expectAsync0(creator.initializeRepo), throwsA(isA<PreparePackageException>()));
}); });
test('non-strict mode calls the right commands', () async { test('non-strict mode calls the right commands', () async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment