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

Revert "[flutter_tools] More Linux version detail (#50739)" (#50840)

Browse Source 
This reverts commit c725f107a178edf04a8ecf857597dc0c131c8933.
This commit is contained in:
Jonah Williams 2020-02-14 16:10:47 -08:00 committed by GitHub
parent 1602be6ab6
commit 238dac141b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 83 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,48 +251,21 @@ class _PosixUtils extends OperatingSystemUtils {
@override
String get name {
if (_name != null) {
return _name;
if (_name == null) {
if (_platform.isMacOS) {
final List<RunResult> results = <RunResult>[
_processUtils.runSync(<String>['sw_vers', '-productName']),
_processUtils.runSync(<String>['sw_vers', '-productVersion']),
_processUtils.runSync(<String>['sw_vers', '-buildVersion']),
];
if (results.every((RunResult result) => result.exitCode == 0)) {
_name = '${results[0].stdout.trim()} ${results[1].stdout
.trim()} ${results[2].stdout.trim()}';
}
}
_name ??= super.name;
}
if (_platform.isMacOS) {
return _name = _macName;
} else if (_platform.isLinux) {
return _name = _linuxName;
}
return _name = super.name;
}
String get _macName {
final List<RunResult> results = <RunResult>[
_processUtils.runSync(<String>['sw_vers', '-productName']),
_processUtils.runSync(<String>['sw_vers', '-productVersion']),
_processUtils.runSync(<String>['sw_vers', '-buildVersion']),
];
if (results.every((RunResult result) => result.exitCode == 0)) {
return '${results[0].stdout.trim()} '
'${results[1].stdout.trim()} '
'${results[2].stdout.trim()}';
}
return super.name;
}
String get _linuxName {
final String fullVersion = _platform.operatingSystemVersion;
// This is formatted as 'Linux version build'. The 'build' part can be
// somewhat long and is not very informative, so omit it.
final List<String> versionParts = fullVersion.split(' ');
if (versionParts.length < 2) {
// The version string didn't have the expected format. Just return the
// full string.
return fullVersion;
}
final String system = versionParts[0];
final String version = versionParts[1];
if (system != 'Linux') {
// If the system name isn't 'Linux', then just return the full string.
return fullVersion;
}
return '$system $version';
return _name;
}
@override

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

@ -4,17 +4,16 @@
import 'package:file/file.dart';
import 'package:file/memory.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:mockito/mockito.dart';
import 'package:process/process.dart';
import 'package:platform/platform.dart';
import '../../src/common.dart';
import '../../src/context.dart';
import '../../src/fake_process_manager.dart';
const String kExecutable = 'foo';
const String kPath1 = '/bar/bin/$kExecutable';
@ -23,51 +22,40 @@ const String kPath2 = '/another/bin/$kExecutable';
class MockLogger extends Mock implements Logger {}
void main() {
FakeProcessManager fakeProcessManager;
MockProcessManager mockProcessManager;
setUp(() {
mockProcessManager = MockProcessManager();
});
OperatingSystemUtils createOSUtils(Platform platform) {
return OperatingSystemUtils(
fileSystem: MemoryFileSystem(),
logger: MockLogger(),
platform: platform,
processManager: fakeProcessManager,
processManager: mockProcessManager,
);
}
group('which on POSIX', () {
testWithoutContext('returns null when executable does not exist', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>['which', kExecutable], exitCode: 1),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'linux'),
);
when(mockProcessManager.runSync(<String>['which', kExecutable]))
.thenReturn(ProcessResult(0, 1, null, null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'linux'));
expect(utils.which(kExecutable), isNull);
});
testWithoutContext('returns exactly one result', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['which', kExecutable],
stdout: kPath1,
),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'linux'),
);
when(mockProcessManager.runSync(<String>['which', 'foo']))
.thenReturn(ProcessResult(0, 0, kPath1, null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'linux'));
expect(utils.which(kExecutable).path, kPath1);
});
testWithoutContext('returns all results for whichAll', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['which', '-a', kExecutable],
stdout: '$kPath1\n$kPath2\n',
),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'linux'),
);
when(mockProcessManager.runSync(<String>['which', '-a', kExecutable]))
.thenReturn(ProcessResult(0, 0, '$kPath1\n$kPath2', null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'linux'));
final List<File> result = utils.whichAll(kExecutable);
expect(result, hasLength(2));
expect(result[0].path, kPath1);
@ -77,129 +65,29 @@ void main() {
group('which on Windows', () {
testWithoutContext('returns null when executable does not exist', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['where', kExecutable],
exitCode: 1,
),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'windows'),
);
when(mockProcessManager.runSync(<String>['where', kExecutable]))
.thenReturn(ProcessResult(0, 1, null, null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'windows'));
expect(utils.which(kExecutable), isNull);
});
testWithoutContext('returns exactly one result', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['where', kExecutable],
stdout: '$kPath1\n$kPath2\n',
),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'windows'),
);
when(mockProcessManager.runSync(<String>['where', 'foo']))
.thenReturn(ProcessResult(0, 0, '$kPath1\n$kPath2', null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'windows'));
expect(utils.which(kExecutable).path, kPath1);
});
testWithoutContext('returns all results for whichAll', () async {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['where', kExecutable],
stdout: '$kPath1\n$kPath2\n',
),
]);
final OperatingSystemUtils utils = createOSUtils(
FakePlatform(operatingSystem: 'windows'),
);
when(mockProcessManager.runSync(<String>['where', kExecutable]))
.thenReturn(ProcessResult(0, 0, '$kPath1\n$kPath2', null));
final OperatingSystemUtils utils = createOSUtils(FakePlatform(operatingSystem: 'windows'));
final List<File> result = utils.whichAll(kExecutable);
expect(result, hasLength(2));
expect(result[0].path, kPath1);
expect(result[1].path, kPath2);
});
});
group('name', () {
testWithoutContext('on Linux', () {
final FakePlatform platform = FakePlatform(
operatingSystem: 'linux',
operatingSystemVersion: 'Linux 5.2.17-amd64 '
'#1 SMP Debian 5.2.17 (2019-10-21 > 2018)',
);
final OperatingSystemUtils utils = createOSUtils(platform);
expect(utils.name, 'Linux 5.2.17-amd64');
});
testWithoutContext('on Mac', () {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['sw_vers', '-productName'],
stdout: 'Mac OS X\n',
),
const FakeCommand(
command: <String>['sw_vers', '-productVersion'],
stdout: '10.14.6\n',
),
const FakeCommand(
command: <String>['sw_vers', '-buildVersion'],
stdout: '16G2128\n',
),
]);
final FakePlatform platform = FakePlatform(
operatingSystem: 'macos',
);
final OperatingSystemUtils utils = createOSUtils(platform);
expect(utils.name, 'Mac OS X 10.14.6 16G2128');
});
testWithoutContext('on Windows', () {
fakeProcessManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(
command: <String>['ver'],
stdout: 'Microsoft Windows [Version 10.0.17763.740]',
),
]);
final FakePlatform platform = FakePlatform(
operatingSystem: 'windows',
);
final OperatingSystemUtils utils = createOSUtils(platform);
expect(utils.name, 'Microsoft Windows [Version 10.0.17763.740]');
});
});
group('makeExecutable', () {
Directory tempDir;
setUp(() {
tempDir = globals.fs.systemTempDirectory.createTempSync(
'flutter_tools_os_utils_test.',
);
});
tearDown(() {
tryToDelete(tempDir);
});
testUsingContext('makeExecutable', () async {
final File file = globals.fs.file(globals.fs.path.join(
tempDir.path,
'foo.script',
));
file.writeAsStringSync('hello world');
globals.os.makeExecutable(file);
final String mode = file.statSync().modeString();
// rwxr--r--
expect(mode.substring(0, 3), endsWith('x'));
}, overrides: <Type, Generator>{
OperatingSystemUtils: () => OperatingSystemUtils(
fileSystem: globals.fs,
logger: globals.logger,
platform: globals.platform,
processManager: globals.processManager,
),
}, skip: const LocalPlatform().isWindows);
});
}
class MockProcessManager extends Mock implements ProcessManager {}

44
packages/flutter_tools/test/general.shard/base/os_utils_test.dart Normal file
View File

@ -0,0 +1,44 @@
// 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:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import '../../src/common.dart';
import '../../src/context.dart';
void main() {
group('OperatingSystemUtils', () {
Directory tempDir;
setUp(() {
tempDir = globals.fs.systemTempDirectory.createTempSync('flutter_tools_os_utils_test.');
});
tearDown(() {
tryToDelete(tempDir);
});
testUsingContext('makeExecutable', () async {
final File file = globals.fs.file(globals.fs.path.join(tempDir.path, 'foo.script'));
file.writeAsStringSync('hello world');
globals.os.makeExecutable(file);
// Skip this test on windows.
if (!globals.platform.isWindows) {
final String mode = file.statSync().modeString();
// rwxr--r--
expect(mode.substring(0, 3), endsWith('x'));
}
}, overrides: <Type, Generator>{
OperatingSystemUtils: () => OperatingSystemUtils(
fileSystem: globals.fs,
logger: globals.logger,
platform: globals.platform,
processManager: globals.processManager,
),
});
});
}