Skip to content

Commit cd6955d

Browse files
bkonyimattkae
andauthored
[flutter_tools] Handle Windows reserved characters in test target path (flutter#191900)
### Description Catch `ArgumentError` and `FormatException` in `TestCommand._parseTestArgument` when test target arguments contain Windows reserved characters or unexpanded globs, emitting a clean `ToolExit` instead of crashing. Fixes flutter#191896 ### Tests - Added hermetic unit test in `packages/flutter_tools/test/commands.shard/hermetic/test_test.dart` verifying that `flutter test` throws a clean `ToolExit` when given a path containing Windows reserved characters. --------- Co-authored-by: Matthew Kosarek <[email protected]>
1 parent bbc989d commit cd6955d

2 files changed

Lines changed: 48 additions & 1 deletion

File tree

‎packages/flutter_tools/lib/src/commands/test.dart‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,16 @@ class TestCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
794794
filePart = globals.fs.path.absolute(filePart);
795795
filePart = globals.fs.path.normalize(filePart);
796796

797-
return Uri.file(filePart).replace(query: queryPart.isEmpty ? null : queryPart);
797+
try {
798+
return Uri.file(
799+
filePart,
800+
windows: globals.platform.isWindows,
801+
).replace(query: queryPart.isEmpty ? null : queryPart);
802+
} on ArgumentError catch (e) {
803+
throwToolExit('Invalid test path "$arg": ${e.message}');
804+
} on FormatException catch (e) {
805+
throwToolExit('Invalid test path "$arg": ${e.message}');
806+
}
798807
}
799808

800809
Future<void> _buildTestAsset({

‎packages/flutter_tools/test/commands.shard/hermetic/test_test.dart‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:flutter_tools/src/base/async_guard.dart';
1212
import 'package:flutter_tools/src/base/common.dart';
1313
import 'package:flutter_tools/src/base/file_system.dart';
1414
import 'package:flutter_tools/src/base/logger.dart';
15+
import 'package:flutter_tools/src/base/platform.dart';
1516
import 'package:flutter_tools/src/base/terminal.dart';
1617
import 'package:flutter_tools/src/build_info.dart';
1718
import 'package:flutter_tools/src/cache.dart';
@@ -54,6 +55,7 @@ void main() {
5455
late LoggingLogger logger;
5556

5657
setUp(() {
58+
Cache.flutterRoot = getFlutterRoot();
5759
fs = MemoryFileSystem.test(
5860
style: globals.platform.isWindows ? FileSystemStyle.windows : FileSystemStyle.posix,
5961
);
@@ -1809,6 +1811,42 @@ resolution: workspace
18091811
ProcessManager: () => FakeProcessManager.any(),
18101812
},
18111813
);
1814+
1815+
testUsingContext(
1816+
'throws ToolExit when test argument contains Windows reserved characters',
1817+
() async {
1818+
final Directory package = globals.fs.directory('package');
1819+
package.childFile('pubspec.yaml')
1820+
..createSync(recursive: true)
1821+
..writeAsStringSync(_pubspecContents);
1822+
writePackageConfigFiles(
1823+
directory: package,
1824+
packages: <String, String>{
1825+
'test_api': 'file:///path/to/pubcache/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19',
1826+
'integration_test': 'file:///path/to/flutter/packages/integration_test',
1827+
},
1828+
mainLibName: 'my_app',
1829+
devDependencies: <String>['test_api', 'integration_test'],
1830+
);
1831+
globals.fs.currentDirectory = package.path;
1832+
1833+
final fakePackageTest = FakePackageTest();
1834+
final testCommand = TestCommand(testWrapper: fakePackageTest);
1835+
final CommandRunner<void> commandRunner = createTestCommandRunner(testCommand);
1836+
1837+
await expectLater(
1838+
() => commandRunner.run(const <String>['test', '--no-pub', r'test\foo*bar_test.dart']),
1839+
throwsToolExit(
1840+
message: r'Invalid test path "test\foo*bar_test.dart": Illegal character in path',
1841+
),
1842+
);
1843+
},
1844+
overrides: <Type, Generator>{
1845+
FileSystem: () => MemoryFileSystem(style: FileSystemStyle.windows),
1846+
ProcessManager: () => FakeProcessManager.any(),
1847+
Platform: () => FakePlatform(operatingSystem: 'windows'),
1848+
},
1849+
);
18121850
}
18131851

18141852
class FakeFlutterTestRunner implements FlutterTestRunner {

0 commit comments

Comments
 (0)