From d61b48b75d5ca91c39c8bc65d7cea8f9ea8d6d4e Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Wed, 12 Sep 2018 22:35:21 -0700 Subject: [PATCH] Fix integration hot-reload test on mac. (#21741) Underlying issue with breakpoint was that /var path is a symlink to a /private/var on mac. Because of that breakpoint could not be resolved. --- .../flutter_tools/test/integration/hot_reload_test.dart | 6 +----- .../test/integration/test_data/test_project.dart | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/flutter_tools/test/integration/hot_reload_test.dart b/packages/flutter_tools/test/integration/hot_reload_test.dart index 97eb158bdf0b..2393ac79100f 100644 --- a/packages/flutter_tools/test/integration/hot_reload_test.dart +++ b/packages/flutter_tools/test/integration/hot_reload_test.dart @@ -49,10 +49,6 @@ void main() { Uri.file(_project.breakpointFile).toString(), _project.breakpointLine); expect(isolate.pauseEvent, isInstanceOf()); - - // TODO(dantup): Unskip for Mac when [1] is fixed. - // [1] hot reload/breakpoints fail when uris prefixed with file:// - // https://github.com/flutter/flutter/issues/18441 - }, skip: !platform.isLinux && !platform.isWindows); + }); }, timeout: const Timeout.factor(6)); } diff --git a/packages/flutter_tools/test/integration/test_data/test_project.dart b/packages/flutter_tools/test/integration/test_data/test_project.dart index ae9b73934463..65637d186352 100644 --- a/packages/flutter_tools/test/integration/test_data/test_project.dart +++ b/packages/flutter_tools/test/integration/test_data/test_project.dart @@ -16,7 +16,8 @@ abstract class TestProject { String get main; // Valid locations for a breakpoint for tests that just need to break somewhere. - String get breakpointFile => fs.path.join(dir.path, 'lib', 'main.dart'); + String get breakpointFile => fs.file(fs.path.join( + dir.path, 'lib', 'main.dart')).resolveSymbolicLinksSync(); int get breakpointLine => lineContaining(main, '// BREAKPOINT'); Future setUpIn(Directory dir) async {