Skip to content

Commit

Permalink
Fix integration hot-reload test on mac. (#21741)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
aam committed Sep 13, 2018
1 parent 23499f4 commit d61b48b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 1 addition & 5 deletions packages/flutter_tools/test/integration/hot_reload_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ void main() {
Uri.file(_project.breakpointFile).toString(),
_project.breakpointLine);
expect(isolate.pauseEvent, isInstanceOf<VMPauseBreakpointEvent>());

// 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));
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> setUpIn(Directory dir) async {
Expand Down

0 comments on commit d61b48b

Please sign in to comment.