Make pub's binstubs resilient to changes in snapshot format.

sdk/lib/_internal/pub/test/test_pub.dart

 // Copyright (c) 2013, 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.
 
 /// Test infrastructure for testing pub.
 ///
 /// Unlike typical unit tests, most pub tests are integration tests that stage
 /// some stuff on the file system, run pub, and then validate the results. This
 /// library provides an API to build tests like that.
 library test_pub;
@@ skipping 468 matching lines @@
   pub.writeLine("y");
 }
 
 /// Gets the absolute path to [relPath], which is a relative path in the test
 /// sandbox.
 String _pathInSandbox(String relPath) {
   return p.join(p.absolute(sandboxDir), relPath);
 }
 
 /// Gets the environment variables used to run pub in a test context.
-Map getPubTestEnvironment([String tokenEndpoint]) {
+Future<Map> getPubTestEnvironment([String tokenEndpoint]) async {
   var environment = {};
   environment['_PUB_TESTING'] = 'true';
   environment['PUB_CACHE'] = _pathInSandbox(cachePath);
 
   // Ensure a known SDK version is set for the tests that rely on that.
   environment['_PUB_TEST_SDK_VERSION'] = "0.1.2+3";
 
   if (tokenEndpoint != null) {
     environment['_PUB_TEST_TOKEN_ENDPOINT'] = tokenEndpoint.toString();
   }
 
+  if (_hasServer) {
+    return port.then((p) {
+      environment['PUB_HOSTED_URL'] = "http://localhost:$p";
+      return environment;
+    });
+  }
+
   return environment;
 }
 
 /// Starts a Pub process and returns a [ScheduledProcess] that supports
 /// interaction with that process.
 ///
 /// Any futures in [args] will be resolved before the process is started.
 ///
 /// If [environment] is given, any keys in it will override the environment
 /// variables passed to the spawned process.
@@ skipping 16 matching lines @@
   // to be manually updated when changing code before running the tests.
   // Otherwise, you will test against stale data.
   //
   // Using the snapshot makes running the tests much faster, which is why we
   // make this trade-off.
   var pubPath = p.join(p.dirname(dartBin), 'snapshots/pub.dart.snapshot');
   var dartArgs = [pubPath, '--verbose'];
   dartArgs.addAll(args);
 
   if (tokenEndpoint == null) tokenEndpoint = new Future.value();
-  var environmentFuture = tokenEndpoint.then((tokenEndpoint) {
-    var pubEnvironment = getPubTestEnvironment(tokenEndpoint);
-
-    // If there is a server running, tell pub what its URL is so hosted
-    // dependencies will look there.
-    if (_hasServer) {
-      return port.then((p) {
-        pubEnvironment['PUB_HOSTED_URL'] = "http://localhost:$p";
-        return pubEnvironment;
-      });
-    }
-
-    return pubEnvironment;
-  }).then((pubEnvironment) {
+  var environmentFuture = tokenEndpoint
+      .then((tokenEndpoint) => getPubTestEnvironment(tokenEndpoint))
+      .then((pubEnvironment) {
     if (environment != null) pubEnvironment.addAll(environment);
     return pubEnvironment;
   });
 
   return new PubProcess.start(dartBin, dartArgs, environment: environmentFuture,
       workingDirectory: _pathInSandbox(appPath),
       description: args.isEmpty ? 'pub' : 'pub ${args.first}');
 }
 
 /// A subclass of [ScheduledProcess] that parses pub's verbose logging output
@@ skipping 286 matching lines @@
       'downloads': 0,
       'created': '2012-09-25T18:38:28.685260',
       'libraries': ['$name.dart'],
       'uploader': ['nweiz@google.com']
     });
   }
 
   return map;
 }
 
+/// Returns the name of the shell script for a binstub named [name].
+///
+/// Adds a ".bat" extension on Windows.
+String binStubName(String name) => Platform.isWindows ? '$name.bat' : name;
+
 /// Compares the [actual] output from running pub with [expected].
 ///
 /// If [expected] is a [String], ignores leading and trailing whitespace
 /// differences and tries to report the offending difference in a nice way.
 ///
 /// If it's a [RegExp] or [Matcher], just reports whether the output matches.
 void _validateOutput(List<String> failures, String pipe, expected,
                      String actual) {
   if (expected == null) return;
 
@@ skipping 110 matching lines @@
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     return description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
 
 /// A [StreamMatcher] that matches multiple lines of output.
 StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));