firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the machine's architecture to macos doctor results. (#65978)

Browse Source
This commit is contained in:
gaaclarke 2020-09-16 17:47:04 -07:00 committed by GitHub
parent fd0554ba89
commit fa646339d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter_tools/lib/src/base/os.dart
View File

@ -253,10 +253,11 @@ class _PosixUtils extends OperatingSystemUtils {
_processUtils.runSync(<String>['sw_vers', '-productName']), _processUtils.runSync(<String>['sw_vers', '-productName']),
_processUtils.runSync(<String>['sw_vers', '-productVersion']), _processUtils.runSync(<String>['sw_vers', '-productVersion']),
_processUtils.runSync(<String>['sw_vers', '-buildVersion']), _processUtils.runSync(<String>['sw_vers', '-buildVersion']),
_processUtils.runSync(<String>['uname', '-m']),
]; ];
if (results.every((RunResult result) => result.exitCode == 0)) { if (results.every((RunResult result) => result.exitCode == 0)) {
_name = '${results[0].stdout.trim()} ${results[1].stdout _name = '${results[0].stdout.trim()} ${results[1].stdout
.trim()} ${results[2].stdout.trim()}'; .trim()} ${results[2].stdout.trim()} ${results[3].stdout.trim()}';
} }
} }
_name ??= super.name; _name ??= super.name;

23
packages/flutter_tools/test/general.shard/base/os_test.dart
View File

@ -95,6 +95,29 @@ void main() {
}); });
}); });
testWithoutContext('macos name', () async {
when(mockProcessManager.runSync(
<String>['sw_vers', '-productName'],
)).thenReturn(ProcessResult(0, 0, 'product', ''));
when(mockProcessManager.runSync(
<String>['sw_vers', '-productVersion'],
)).thenReturn(ProcessResult(0, 0, 'version', ''));
when(mockProcessManager.runSync(
<String>['sw_vers', '-buildVersion'],
)).thenReturn(ProcessResult(0, 0, 'build', ''));
when(mockProcessManager.runSync(
<String>['uname', '-m'],
)).thenReturn(ProcessResult(0, 0, 'arch', ''));
final MockFileSystem fileSystem = MockFileSystem();
final OperatingSystemUtils utils = OperatingSystemUtils(
fileSystem: fileSystem,
logger: BufferLogger.test(),
platform: FakePlatform(operatingSystem: 'macos'),
processManager: mockProcessManager,
);
expect(utils.name, 'product version build arch');
});
testWithoutContext('If unzip fails, include stderr in exception text', () { testWithoutContext('If unzip fails, include stderr in exception text', () {
const String exceptionMessage = 'Something really bad happened.'; const String exceptionMessage = 'Something really bad happened.';
when(mockProcessManager.runSync( when(mockProcessManager.runSync(