Properly include the hosted URL in all IDs.

test/descriptor.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.
 
 /// Pub-specific scheduled_test descriptors.
 import 'package:oauth2/oauth2.dart' as oauth2;
 import 'package:pub/src/io.dart';
 import 'package:pub/src/utils.dart';
 import 'package:scheduled_test/descriptor.dart';
 import 'package:scheduled_test/scheduled_server.dart';
@@ skipping 109 matching lines @@
   return dir(packagesPath, contents);
 }
 
 /// Describes the global package cache directory containing all the given
 /// [packages], which should be name/version pairs. The packages will be
 /// validated against the format produced by the mock package server.
 ///
 /// A package's value may also be a list of versions, in which case all
 /// versions are expected to be downloaded.
 ///
+/// If [port] is passed, it's used as the port number of the local hosted server
+/// that this cache represents. It may be either an `int` or a `Future<int>`.
+///
 /// If [includePubspecs] is `true`, then pubspecs will be created for each
 /// package. Defaults to `false` so that the contents of pubspecs are not
 /// validated since they will often lack the dependencies section that the
 /// real pubspec being compared against has. You usually only need to pass
 /// `true` for this if you plan to call [create] on the resulting descriptor.
-Descriptor cacheDir(Map packages, {bool includePubspecs: false}) {
+Descriptor cacheDir(Map packages, {port, bool includePubspecs: false}) {
   var contents = <Descriptor>[];
   packages.forEach((name, versions) {
     if (versions is! List) versions = [versions];
     for (var version in versions) {
       var packageContents = [libDir(name, '$name $version')];
       if (includePubspecs) {
         packageContents.add(libPubspec(name, version));
       }
       contents.add(dir("$name-$version", packageContents));
     }
   });
 
-  return hostedCache(contents);
+  return hostedCache(contents, port: port);
 }
 
 /// Describes the main cache directory containing cached hosted packages
 /// downloaded from the mock package server.
-Descriptor hostedCache(Iterable<Descriptor> contents) {
+///
+/// If [port] is passed, it's used as the port number of the local hosted server
+/// that this cache represents. It may be either an `int` or a `Future<int>`.
+Descriptor hostedCache(Iterable<Descriptor> contents, {port}) {
   return dir(cachePath, [
     dir('hosted', [
-      async(globalServer.port.then((p) => dir('localhost%58$p', contents)))
+      async(awaitObject(port ?? globalServer.port)
+          .then((p) => dir('localhost%58$p', contents)))
     ])
   ]);
 }
 
 /// Describes the file in the system cache that contains the client's OAuth2
 /// credentials. The URL "/token" on [server] will be used as the token
 /// endpoint for refreshing the access token.
 Descriptor credentialsFile(
     ScheduledServer server,
     String accessToken,
@@ skipping 22 matching lines @@
 /// are located on disk. If the strings are semantic versions, then the packages
 /// are located in the system cache; otherwise, the strings are interpreted as
 /// relative `file:` URLs.
 ///
 /// Validation checks that the `.packages` file exists, has the expected
 /// entries (one per key in [dependencies]), each with a path that contains
 /// either the version string (for a reference to the pub cache) or a
 /// path to a path dependency, relative to the application directory.
 Descriptor packagesFile([Map dependencies]) =>
   new PackagesFileDescriptor(dependencies);