Skip to content

Commit 4466c9d

Browse files
authored
Re-enable integration tests (flutter#20947)
* Unskip expression evaluation integration tests for non-Windows * Add additional into to skip comments * Add missing import
1 parent 5464492 commit 4466c9d

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

packages/flutter_tools/test/integration/expression_evaluation_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'dart:async';
66

77
import 'package:file/file.dart';
88
import 'package:flutter_tools/src/base/file_system.dart';
9+
import 'package:flutter_tools/src/base/platform.dart';
910

1011
import 'package:vm_service_client/vm_service_client.dart';
1112

@@ -107,8 +108,7 @@ void main() {
107108
await breakInBuildMethod(_flutter);
108109
await evaluateComplexReturningExpressions();
109110
});
110-
// https://github.com/flutter/flutter/issues/17833
111-
// The test appears to be flaky and time out some times, skipping while
112-
// investigation is ongoing: https://github.com/flutter/flutter/issues/19542
113-
}, timeout: const Timeout.factor(6), skip: true);
111+
// TODO(dantup): Unskip after flutter-tester is fixed on Windows:
112+
// https://github.com/flutter/flutter/issues/17833.
113+
}, timeout: const Timeout.factor(6), skip: platform.isWindows);
114114
}

packages/flutter_tools/test/integration/flutter_attach_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ void main() {
3838
await _flutterAttach.attach(_flutterRun.vmServicePort);
3939
await _flutterAttach.hotReload();
4040
});
41-
// TODO(dantup): Unskip after https://github.com/flutter/flutter/issues/17833.
41+
// TODO(dantup): Unskip after flutter-tester is fixed on Windows:
42+
// https://github.com/flutter/flutter/issues/17833.
4243
}, timeout: const Timeout.factor(6), skip: platform.isWindows);
4344
}

packages/flutter_tools/test/integration/hot_reload_test.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ void main() {
3232
test('works without error', () async {
3333
await _flutter.run();
3434
await _flutter.hotReload();
35-
// TODO(dantup): Unskip after https://github.com/flutter/flutter/issues/17833.
35+
// TODO(dantup): Unskip after flutter-tester is fixed on Windows:
36+
// https://github.com/flutter/flutter/issues/17833.
3637
}, skip: platform.isWindows);
3738

3839
test('hits breakpoints with file:// prefixes after reload', () async {
@@ -43,7 +44,12 @@ void main() {
4344
new Uri.file(_project.breakpointFile).toString(),
4445
_project.breakpointLine);
4546
expect(isolate.pauseEvent, isInstanceOf<VMPauseBreakpointEvent>());
46-
// TODO(dantup): Unskip after https://github.com/flutter/flutter/issues/18441.
47+
// TODO(dantup): Unskip for Mac when [1] is fixed, unskip on Windows when
48+
// both [1] and [2] are fixed.
49+
// [1] hot reload/breakpoints fail when uris prefixed with file://
50+
// https://github.com/flutter/flutter/issues/18441
51+
// [2] flutter-tester doesn't work on Windows
52+
// https://github.com/flutter/flutter/issues/17833
4753
}, skip: !platform.isLinux);
4854
}, timeout: const Timeout.factor(6));
4955
}

packages/flutter_tools/test/integration/lifetime_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ void main() {
4545
await new Future<void>.delayed(requiredLifespan);
4646
expect(_flutter.hasExited, equals(false));
4747
});
48-
// TODO(dantup): Unskip after https://github.com/flutter/flutter/issues/17833.
48+
// TODO(dantup): Unskip after flutter-tester is fixed on Windows:
49+
// https://github.com/flutter/flutter/issues/17833.
4950
}, timeout: const Timeout.factor(6), skip: platform.isWindows);
5051
}

0 commit comments

Comments
 (0)