Unverified Commit d89604d8 authored by Danny Tuppeny's avatar Danny Tuppeny Committed by GitHub

Change file paths to URIs to fix "Could not run configuration in engine" on Windows (#22507)

* Change file paths to URIs to fix "Could not run configuration in engine" on Windows

Plus unskip test that was failing due to this.

Fixes #21348.

* Remove unused import
parent 9a9ef594
...@@ -921,13 +921,12 @@ class VM extends ServiceObjectOwner { ...@@ -921,13 +921,12 @@ class VM extends ServiceObjectOwner {
Uri main, Uri main,
Uri packages, Uri packages,
Uri assetsDirectory) { Uri assetsDirectory) {
// TODO(goderbauer): Transfer Uri (instead of file path) when remote end supports it.
return invokeRpc<ServiceMap>('_flutter.runInView', return invokeRpc<ServiceMap>('_flutter.runInView',
params: <String, dynamic> { params: <String, dynamic> {
'viewId': viewId, 'viewId': viewId,
'mainScript': main.toFilePath(windows: false), 'mainScript': main.toString(),
'packagesFile': packages.toFilePath(windows: false), 'packagesFile': packages.toString(),
'assetDirectory': assetsDirectory.toFilePath(windows: false) 'assetDirectory': assetsDirectory.toString()
}); });
} }
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
import 'package:file/file.dart'; import 'package:file/file.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:vm_service_client/vm_service_client.dart'; import 'package:vm_service_client/vm_service_client.dart';
import '../src/common.dart'; import '../src/common.dart';
...@@ -37,9 +35,7 @@ void main() { ...@@ -37,9 +35,7 @@ void main() {
test('restart works without error', () async { test('restart works without error', () async {
await _flutter.run(); await _flutter.run();
await _flutter.hotRestart(); await _flutter.hotRestart();
// TODO(dantup): Unskip after flutter-tester restart issue is fixed on Windows: });
// https://github.com/flutter/flutter/issues/21348.
}, skip: platform.isWindows);
test('reload hits breakpoints with file:// prefixes after reload', () async { test('reload hits breakpoints with file:// prefixes after reload', () async {
await _flutter.run(withDebugger: true); await _flutter.run(withDebugger: true);
......
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