OLD | NEW |
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS d.file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS d.file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library pub_tests; | 5 library pub_tests; |
6 | 6 |
7 import 'dart:async'; | 7 import 'dart:async'; |
8 import 'dart:convert'; | 8 import 'dart:convert'; |
9 import 'dart:io'; | 9 import 'dart:io'; |
10 | 10 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 _ports.clear(); | 177 _ports.clear(); |
178 | 178 |
179 if (_webSocket != null) { | 179 if (_webSocket != null) { |
180 _webSocket.close(); | 180 _webSocket.close(); |
181 _webSocket = null; | 181 _webSocket = null; |
182 _webSocketBroadcastStream = null; | 182 _webSocketBroadcastStream = null; |
183 } | 183 } |
184 }); | 184 }); |
185 | 185 |
186 if (shouldGetFirst) { | 186 if (shouldGetFirst) { |
187 _pubServer.stdout.expect(consumeThrough("Got dependencies!")); | 187 _pubServer.stdout.expect(consumeThrough(anyOf([ |
| 188 "Got dependencies!", |
| 189 matches(new RegExp(r"^Changed \d+ dependenc")) |
| 190 ]))); |
188 } | 191 } |
189 | 192 |
190 _pubServer.stdout.expect(startsWith("Loading source assets...")); | 193 _pubServer.stdout.expect(startsWith("Loading source assets...")); |
191 _pubServer.stdout.expect(consumeWhile(matches("Loading .* transformers..."))); | 194 _pubServer.stdout.expect(consumeWhile(matches("Loading .* transformers..."))); |
192 | 195 |
193 _pubServer.stdout.expect(predicate(_parseAdminPort)); | 196 _pubServer.stdout.expect(predicate(_parseAdminPort)); |
194 | 197 |
195 // The server should emit one or more ports. | 198 // The server should emit one or more ports. |
196 _pubServer.stdout.expect( | 199 _pubServer.stdout.expect( |
197 consumeWhile(predicate(_parsePort, 'emits server url'))); | 200 consumeWhile(predicate(_parsePort, 'emits server url'))); |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 /// included. Unlike [getServerUrl], this should only be called after the ports | 480 /// included. Unlike [getServerUrl], this should only be called after the ports |
478 /// are known. | 481 /// are known. |
479 String _getServerUrlSync([String root, String path]) { | 482 String _getServerUrlSync([String root, String path]) { |
480 if (root == null) root = 'web'; | 483 if (root == null) root = 'web'; |
481 expect(_ports, contains(root)); | 484 expect(_ports, contains(root)); |
482 var url = "http://localhost:${_ports[root]}"; | 485 var url = "http://localhost:${_ports[root]}"; |
483 if (path != null) url = "$url/$path"; | 486 if (path != null) url = "$url/$path"; |
484 return url; | 487 return url; |
485 } | 488 } |
486 | 489 |
OLD | NEW |