Roll to pickup pool changes

packages/package_config/test/parse_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library package_config.parse_test;
 
 import "package:package_config/packages.dart";
 import "package:package_config/packages_file.dart" show parse;
 import "package:package_config/src/packages_impl.dart";
 import "package:test/test.dart";
@@ skipping 84 matching lines @@
   });
 
   test("no invalid chars accepted", () {
     var map = {};
     for (int i = 0; i < allValidChars.length; i++) {
       map[allValidChars.codeUnitAt(i)] = true;
     }
     for (int i = 0; i <= 255; i++) {
       if (map[i] == true) continue;
       var char = new String.fromCharCode(i);
-      expect(() => doParse("x${char}x:x", null), throws);
+      expect(() => doParse("x${char}x:x", null),
+          anyOf(throwsNoSuchMethodError, throwsFormatException));
     }
   });
 
   test("no escapes", () {
-    expect(() => doParse("x%41x:x", base), throws);
+    expect(() => doParse("x%41x:x", base), throwsFormatException);
   });
 
   test("same name twice", () {
-    expect(() => doParse(singleRelativeSample * 2, base), throws);
+    expect(
+        () => doParse(singleRelativeSample * 2, base), throwsFormatException);
   });
 
   for (String invalidSample in invalid) {
     test("invalid '$invalidSample'", () {
       var result;
       try {
         result = doParse(invalidSample, base);
       } on FormatException {
         // expected
         return;
@@ skipping 31 matching lines @@
   "foobar=baz.dart", // no colon (but an equals, which is not the same)
   ".:../test/", // dot segment
   "..:../test/", // dot-dot segment
   "...:../test/", // dot-dot-dot segment
   "foo/bar:../test/", // slash in name
   "/foo:../test/", // slash at start of name
   "?:../test/", // invalid characters.
   "[:../test/", // invalid characters.
   "x#:../test/", // invalid characters.
 ];