Hook in the version solver to pub install.

utils/tests/pub/test_pub.dart

 // Copyright (c) 2012, 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');
 
 #import('dart:io');
+#import('dart:isolate');
+#import('dart:json');
 #import('dart:uri');
 
 #import('../../../lib/unittest/unittest.dart');
 #import('../../lib/file_system.dart', prefix: 'fs');
 #import('../../pub/io.dart');
 #import('../../pub/utils.dart');
 #import('../../pub/yaml/yaml.dart');
 
 /**
  * Creates a new [FileDescriptor] with [name] and [contents].
@@ skipping 26 matching lines @@
 void serve(String host, int port, [List<Descriptor> contents]) {
   var baseDir = dir("serve-dir", contents);
   if (host == 'localhost') {
     host = '127.0.0.1';
   }
 
   _schedule((_) {
     var server = new HttpServer();
     server.defaultRequestHandler = (request, response) {
       var path = request.uri.replaceFirst("/", "").split("/");
-      var stream = baseDir.load(path);
       response.persistentConnection = false;
-      if (stream == null) {
+      var stream;
+      try {
+        stream = baseDir.load(path);
+      } catch (var e) {
         response.statusCode = 404;
+        response.contentLength = 0;
         response.outputStream.close();
         return;
       }
 
       var future = consumeInputStream(stream);
       future.then((data) {
         response.statusCode = 200;
         response.contentLength = data.length;
         response.outputStream.write(data);
         response.outputStream.close();
@@ skipping 21 matching lines @@
 void servePackages(String host, int port, List<String> pubspecs) {
   var packages = <Map<String, String>>{};
   pubspecs.forEach((spec) {
     var parsed = loadYaml(spec);
     var name = parsed['name'];
     var version = parsed['version'];
     packages.putIfAbsent(name, () => <String>{})[version] = spec;
   });
 
   serve(host, port, [
-    dir('packages', packages.getKeys().map((name) {
-      return dir(name, [
-        dir('versions', packages[name].getKeys().map((version) {
-          return tar('$version.tar.gz', [
-            file('pubspec.yaml', packages[name][version]),
-            file('$name.dart', 'main() => print("$name $version");')
-          ]);
-        }))
-      ]);
-    }))
+    dir('packages', flatten(packages.getKeys().map((name) {
+      return [
+        file('$name.json',
+          JSON.stringify({'versions': packages[name].getKeys()})),
+        dir(name, [
+          dir('versions', flatten(packages[name].getKeys().map((version) {
+            return [
+              file('$version.yaml', packages[name][version]),
+              tar('$version.tar.gz', [
+                file('pubspec.yaml', packages[name][version]),
+                file('$name.dart', 'main() => print("$name $version");')
+              ])
+            ];
+          })))
+        ])
+      ];
+    })))
   ]);
 }
 
 /**
  * The path of the package cache directory used for tests. Relative to the
  * sandbox directory.
  */
 final String cachePath = "cache";
 
 /**
@@ skipping 378 matching lines @@
                     'but contained:\n\n$text');
       });
     });
   }
 
   /**
    * Loads the contents of the file.
    */
   InputStream load(List<String> path) {
     if (!path.isEmpty()) {
-      var joinedPath = Strings.join('/', path);
+      var joinedPath = Strings.join(path, '/');
       throw "Can't load $joinedPath from within $name: not a directory.";
     }
 
     var stream = new ListInputStream();
     stream.write(contents.charCodes());
+    stream.markEndOfStream();
     return stream;
   }
 }
 
 /**
  * Describes a directory and its contents. These are used both for setting up
  * an expected directory tree before running a test, and for validating that
  * the file system matches some expectations after running it.
  */
 class DirectoryDescriptor extends Descriptor {
@@ skipping 59 matching lines @@
     if (path.isEmpty()) {
       throw "Can't load the contents of $name: is a directory.";
     }
 
     for (var descriptor in contents) {
       if (descriptor.name == path[0]) {
         return descriptor.load(path.getRange(1, path.length - 1));
       }
     }
 
-    throw "Directory $name doesn't contain ${Strings.join('/', path)}.";
+    throw "Directory $name doesn't contain ${Strings.join(path, '/')}.";
   }
 }
 
 /**
  * Describes a Git repository and its contents.
  */
 class GitRepoDescriptor extends DirectoryDescriptor {
   GitRepoDescriptor(Pattern name, List<Descriptor> contents)
   : super(name, contents);
 
@@ skipping 78 matching lines @@
    */
   Future validate(String path) {
     throw "TODO(nweiz): implement this";
   }
 
   /**
    * Loads the contents of this tar file.
    */
   InputStream load(List<String> path) {
     if (!path.isEmpty()) {
-      var joinedPath = Strings.join('/', path);
+      var joinedPath = Strings.join(path, '/');
       throw "Can't load $joinedPath from within $name: not a directory.";
     }
 
     var sinkStream = new ListInputStream();
     var tempDir;
     // TODO(nweiz): propagate any errors to the return value. See issue 3657.
     createTempDir("pub-test-tmp-").chain((_tempDir) {
       tempDir = _tempDir;
       return create(tempDir);
     }).then((tar) {
@@ skipping 14 matching lines @@
 }
 
 /**
  * Schedules a callback to be called after Pub is run with [runPub], even if it
  * fails.
  */
 void _scheduleCleanup(_ScheduledEvent event) {
   if (_scheduledCleanup == null) _scheduledCleanup = [];
   _scheduledCleanup.add(event);
 }