runtime/observatory/tests/service/dev_fs_spawn_test.dart - Issue 2759973004: Fix observatory tests broken by running dartfmt. Temporarily reverted formatting for evaluate_activ…

Unified Diff: runtime/observatory/tests/service/dev_fs_spawn_test.dart

Issue 2759973004: Fix observatory tests broken by running dartfmt. Temporarily reverted formatting for evaluate_activ… (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « runtime/observatory/tests/service/dev_fs_http_put_weird_char_test.dart ('k') | runtime/observatory/tests/service/dev_fs_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: runtime/observatory/tests/service/dev_fs_spawn_test.dart

diff --git a/runtime/observatory/tests/service/dev_fs_spawn_test.dart b/runtime/observatory/tests/service/dev_fs_spawn_test.dart

index ae8f48294bb2ecd30f181b13b78d19684bafba31..10b23b01d03b1c2b81f1ce6ec79c562f2690dd68 100644

--- a/runtime/observatory/tests/service/dev_fs_spawn_test.dart

+++ b/runtime/observatory/tests/service/dev_fs_spawn_test.dart

@@ -16,8 +16,8 @@ var tests = [

// Create a new fs.

var fsName = 'scratch';

var result = await vm.invokeRpcNoUpgrade('_createDevFS', {

- 'fsName': fsName,

- });

+ 'fsName': fsName,

+ });

expect(result['type'], equals('FileSystem'));

expect(result['name'], equals('scratch'));

expect(result['uri'], new isInstanceOf<String>());

@@ -27,51 +27,48 @@ var tests = [

// delivered asynchronously.

Completer completer = new Completer();

var sub;

- sub = await vm.listenEventStream(

- VM.kIsolateStream,

- (ServiceEvent event) {

- if (event.kind == ServiceEvent.kIsolateSpawn) {

- expect(event.spawnToken, equals('someSpawnToken'));

- expect(event.spawnError, startsWith(

- 'IsolateSpawnException: Unable to spawn isolate: '));

- expect(event.isolate, isNull);

- completer.complete();

- sub.cancel();

- }

- });

+ sub = await vm.listenEventStream(VM.kIsolateStream, (ServiceEvent event) {

+ if (event.kind == ServiceEvent.kIsolateSpawn) {

+ expect(event.spawnToken, equals('someSpawnToken'));

+ expect(event.spawnError,

+ startsWith('IsolateSpawnException: Unable to spawn isolate: '));

+ expect(event.isolate, isNull);

+ completer.complete();

+ sub.cancel();

+ }

+ });

result = await vm.invokeRpcNoUpgrade('_spawnUri', {

- 'token': 'someSpawnToken',

- 'uri': '${fsUri}doesnotexist.dart',

+ 'token': 'someSpawnToken',

+ 'uri': '${fsUri}doesnotexist.dart',

});

expect(result['type'], equals('Success'));

await completer.future;

// Delete the fs.

result = await vm.invokeRpcNoUpgrade('_deleteDevFS', {

- 'fsName': fsName,

+ 'fsName': fsName,

});

expect(result['type'], equals('Success'));

(VM vm) async {

// Create a new fs.

var fsName = 'scratch';

var result = await vm.invokeRpcNoUpgrade('_createDevFS', {

- 'fsName': fsName,

- });

+ 'fsName': fsName,

+ });

expect(result['type'], equals('FileSystem'));

expect(result['name'], equals('scratch'));

expect(result['uri'], new isInstanceOf<String>());

var fsUri = result['uri'];

var filePaths = [

- 'devfs_file0.dart',

- 'devfs_file1.dart',

- 'devfs_file2.dart'

+ 'devfs_file0.dart',

+ 'devfs_file1.dart',

+ 'devfs_file2.dart'

];

var scripts = [

-'''

+ '''

import 'dart:developer';

proofOfLife() => 'I live!';

main() {

@@ -79,7 +76,7 @@ main() {

debugger();

}

''',

-'''

+ '''

import 'dart:developer';

var globalArgs;

proofOfLife() => 'I live, \${globalArgs}!';

@@ -89,7 +86,7 @@ main(args) {

debugger();

}

''',

-'''

+ '''

import 'dart:developer';

var globalArgs;

var globalMsg;

@@ -118,20 +115,18 @@ main(args, msg) {

// that we are notified.

Completer completer = new Completer();

var sub;

- sub = await vm.listenEventStream(

- VM.kIsolateStream,

- (ServiceEvent event) {

- if (event.kind == ServiceEvent.kIsolateSpawn) {

- expect(event.spawnToken, equals('mySpawnToken0'));

- expect(event.isolate, isNotNull);

- expect(event.isolate.name, equals('devfs_file0.dart\$main'));

- completer.complete(event.isolate);

- sub.cancel();

- }

- });

+ sub = await vm.listenEventStream(VM.kIsolateStream, (ServiceEvent event) {

+ if (event.kind == ServiceEvent.kIsolateSpawn) {

+ expect(event.spawnToken, equals('mySpawnToken0'));

+ expect(event.isolate, isNotNull);

+ expect(event.isolate.name, equals('devfs_file0.dart\$main'));

+ completer.complete(event.isolate);

+ sub.cancel();

+ }

+ });

result = await vm.invokeRpcNoUpgrade('_spawnUri', {

- 'token': 'mySpawnToken0',

- 'uri': '${fsUri}${filePaths[0]}',

+ 'token': 'mySpawnToken0',

+ 'uri': '${fsUri}${filePaths[0]}',

});

expect(result['type'], equals('Success'));

var spawnedIsolate = await completer.future;

@@ -148,21 +143,19 @@ main(args, msg) {

// Spawn the script with arguments.

completer = new Completer();

- sub = await vm.listenEventStream(

- VM.kIsolateStream,

- (ServiceEvent event) {

- if (event.kind == ServiceEvent.kIsolateSpawn) {

- expect(event.spawnToken, equals('mySpawnToken1'));

- expect(event.isolate, isNotNull);

- expect(event.isolate.name, equals('devfs_file1.dart\$main'));

- completer.complete(event.isolate);

- sub.cancel();

- }

- });

+ sub = await vm.listenEventStream(VM.kIsolateStream, (ServiceEvent event) {

+ if (event.kind == ServiceEvent.kIsolateSpawn) {

+ expect(event.spawnToken, equals('mySpawnToken1'));

+ expect(event.isolate, isNotNull);

+ expect(event.isolate.name, equals('devfs_file1.dart\$main'));

+ completer.complete(event.isolate);

+ sub.cancel();

+ }

+ });

result = await vm.invokeRpcNoUpgrade('_spawnUri', {

- 'token': 'mySpawnToken1',

- 'uri': '${fsUri}${filePaths[1]}',

- 'args': ['one', 'two', 'three']

+ 'token': 'mySpawnToken1',

+ 'uri': '${fsUri}${filePaths[1]}',

+ 'args': ['one', 'two', 'three']

});

expect(result['type'], equals('Success'));

spawnedIsolate = await completer.future;

@@ -179,22 +172,20 @@ main(args, msg) {

// Spawn the script with arguments and message

completer = new Completer();

- sub = await vm.listenEventStream(

- VM.kIsolateStream,

- (ServiceEvent event) {

- if (event.kind == ServiceEvent.kIsolateSpawn) {

- expect(event.spawnToken, equals('mySpawnToken2'));

- expect(event.isolate, isNotNull);

- expect(event.isolate.name, equals('devfs_file2.dart\$main'));

- completer.complete(event.isolate);

- sub.cancel();

- }

- });

+ sub = await vm.listenEventStream(VM.kIsolateStream, (ServiceEvent event) {

+ if (event.kind == ServiceEvent.kIsolateSpawn) {

+ expect(event.spawnToken, equals('mySpawnToken2'));

+ expect(event.isolate, isNotNull);

+ expect(event.isolate.name, equals('devfs_file2.dart\$main'));

+ completer.complete(event.isolate);

+ sub.cancel();

+ }

+ });

result = await vm.invokeRpcNoUpgrade('_spawnUri', {

- 'token': 'mySpawnToken2',

- 'uri': '${fsUri}${filePaths[2]}',

- 'args': ['A', 'B', 'C'],

- 'message': 'test'

+ 'token': 'mySpawnToken2',

+ 'uri': '${fsUri}${filePaths[2]}',

+ 'args': ['A', 'B', 'C'],

+ 'message': 'test'

});

expect(result['type'], equals('Success'));

spawnedIsolate = await completer.future;

@@ -211,7 +202,7 @@ main(args, msg) {

// Delete the fs.

result = await vm.invokeRpcNoUpgrade('_deleteDevFS', {

- 'fsName': fsName,

+ 'fsName': fsName,

});

expect(result['type'], equals('Success'));