| Index: pkg/analyzer_plugin/test/integration/support/integration_tests.dart
|
| diff --git a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
|
| index 99f7b0d9a2105fe3f8c0e19ff8a40151b695a203..8d8373942e569eebb6298363160ca2c2eba1c291 100644
|
| --- a/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
|
| +++ b/pkg/analyzer_plugin/test/integration/support/integration_tests.dart
|
| @@ -261,17 +261,6 @@ abstract class AbstractAnalysisServerIntegrationTest
|
| }
|
|
|
| /**
|
| - * An error result from a server request.
|
| - */
|
| -class ServerErrorMessage {
|
| - final Map message;
|
| -
|
| - ServerErrorMessage(this.message);
|
| -
|
| - dynamic get error => message['error'];
|
| -}
|
| -
|
| -/**
|
| * Wrapper class for Matcher which doesn't create the underlying Matcher object
|
| * until it is needed. This is necessary in order to create matchers that can
|
| * refer to themselves (so that recursive data structures can be represented).
|
| @@ -528,7 +517,7 @@ class Server {
|
| /**
|
| * Stop the server.
|
| */
|
| - Future kill(String reason) {
|
| + Future<int> kill(String reason) {
|
| debugStdio();
|
| _recordStdio('FORCIBLY TERMINATING PROCESS: $reason');
|
| _process.kill();
|
| @@ -739,6 +728,17 @@ class Server {
|
| }
|
|
|
| /**
|
| + * An error result from a server request.
|
| + */
|
| +class ServerErrorMessage {
|
| + final Map message;
|
| +
|
| + ServerErrorMessage(this.message);
|
| +
|
| + dynamic get error => message['error'];
|
| +}
|
| +
|
| +/**
|
| * Matcher that matches a list of objects, each of which satisfies the given
|
| * matcher.
|
| */
|
|
|