Unverified Commit 5efe0958 authored by Dan Field's avatar Dan Field Committed by GitHub

Revert "Roll engine to aed6b8c46b05c7cee4506a9757dd9ea1b40583c2." (#23170)

This reverts commit a34488dd.
parent a34488dd
aed6b8c46b05c7cee4506a9757dd9ea1b40583c2 08272ee6aa33cc367911ac816f25676c3f439c6d
...@@ -3,11 +3,6 @@ ...@@ -3,11 +3,6 @@
include: ../analysis_options.yaml include: ../analysis_options.yaml
analyzer:
errors:
# https://github.com/dart-lang/sdk/issues/34819
invalid_use_of_protected_member: ignore
linter: linter:
rules: rules:
- public_member_api_docs - public_member_api_docs
...@@ -6,6 +6,7 @@ import 'dart:async'; ...@@ -6,6 +6,7 @@ import 'dart:async';
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';
...@@ -110,6 +111,5 @@ void main() { ...@@ -110,6 +111,5 @@ void main() {
// TODO(dantup): Unskip after flutter-tester is fixed on Windows: // TODO(dantup): Unskip after flutter-tester is fixed on Windows:
// https://github.com/flutter/flutter/issues/17833. // https://github.com/flutter/flutter/issues/17833.
// https://github.com/flutter/flutter/issues/21348. // https://github.com/flutter/flutter/issues/21348.
// https://github.com/flutter/flutter/issues/23109 }, timeout: const Timeout.factor(6), skip: platform.isWindows);
}, timeout: const Timeout.factor(6), skip: true);
} }
...@@ -48,6 +48,5 @@ void main() { ...@@ -48,6 +48,5 @@ void main() {
await _flutterAttach.attach(_flutterRun.vmServicePort); await _flutterAttach.attach(_flutterRun.vmServicePort);
await _flutterAttach.hotReload(); await _flutterAttach.hotReload();
}); });
// https://github.com/flutter/flutter/issues/23109 }, timeout: const Timeout.factor(6));
}, timeout: const Timeout.factor(6), skip: true);
} }
...@@ -46,6 +46,5 @@ void main() { ...@@ -46,6 +46,5 @@ void main() {
_project.breakpointLine); _project.breakpointLine);
expect(isolate.pauseEvent, isInstanceOf<VMPauseBreakpointEvent>()); expect(isolate.pauseEvent, isInstanceOf<VMPauseBreakpointEvent>());
}); });
// https://github.com/flutter/flutter/issues/23109 }, timeout: const Timeout.factor(6));
}, timeout: const Timeout.factor(6), skip: true);
} }
...@@ -44,6 +44,5 @@ void main() { ...@@ -44,6 +44,5 @@ void main() {
await Future<void>.delayed(requiredLifespan); await Future<void>.delayed(requiredLifespan);
expect(_flutter.hasExited, equals(false)); expect(_flutter.hasExited, equals(false));
}); });
// https://github.com/flutter/flutter/issues/23109 }, timeout: const Timeout.factor(6));
}, timeout: const Timeout.factor(6), skip: 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