Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: pkg/analysis_server/test/integration/integration_tests.dart

Issue 1669473004: Beef up analysis server integration test messages. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/test/integration/integration_tests.dart
diff --git a/pkg/analysis_server/test/integration/integration_tests.dart b/pkg/analysis_server/test/integration/integration_tests.dart
index f05a7758d20a2516419376ec0f96f1d382e663fd..5361816f7e4635dec7b8b265327d94a38be710a0 100644
--- a/pkg/analysis_server/test/integration/integration_tests.dart
+++ b/pkg/analysis_server/test/integration/integration_tests.dart
@@ -174,7 +174,7 @@ abstract class AbstractAnalysisServerIntegrationTest
// doesn't exit, then forcibly terminate it.
sendServerShutdown();
return server.exitCode.timeout(SHUTDOWN_TIMEOUT, onTimeout: () {
- return server.kill();
+ return server.kill('server failed to exit');
});
}
@@ -491,9 +491,9 @@ class Server {
/**
* Stop the server.
*/
- Future kill() {
+ Future kill(String reason) {
debugStdio();
- _recordStdio('PROCESS FORCIBLY TERMINATED');
+ _recordStdio('FORCIBLY TERMINATING PROCESS: $reason');
_process.kill();
return _process.exitCode;
}
@@ -514,7 +514,7 @@ class Server {
try {
message = JSON.decoder.convert(trimmedLine);
} catch (exception) {
- _badDataFromServer();
+ _badDataFromServer('JSON decode failure: $exception');
return;
}
expect(message, isMap);
@@ -557,7 +557,7 @@ class Server {
.listen((String line) {
String trimmedLine = line.trim();
_recordStdio('ERR: $trimmedLine');
- _badDataFromServer();
+ _badDataFromServer('Message received on stderr', silent: true);
});
}
@@ -630,9 +630,8 @@ class Server {
return Process.start(dartBinary, arguments).then((Process process) {
_process = process;
process.exitCode.then((int code) {
- _recordStdio('TERMINATED WITH EXIT CODE $code');
if (code != 0) {
- _badDataFromServer();
+ _badDataFromServer('server terminated with exit code $code');
}
});
});
@@ -641,7 +640,10 @@ class Server {
/**
* Deal with bad data received from the server.
*/
- void _badDataFromServer() {
+ void _badDataFromServer(String details, {bool silent: false}) {
+ if (!silent) {
+ _recordStdio('BAD DATA FROM SERVER: $details');
+ }
if (_receivedBadDataFromServer) {
// We're already dealing with it.
return;
@@ -654,7 +656,7 @@ class Server {
// entire stacktrace. Use expectAsync() to prevent the test from
// ending during this 1 second.
new Future.delayed(new Duration(seconds: 1), expectAsync(() {
- fail('Bad data received from server');
+ fail('Bad data received from server: $details');
}));
}
« no previous file with comments | « pkg/analysis_server/benchmark/integration/driver.dart ('k') | pkg/analysis_server/test/timing/timing_framework.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698