Install barback from a hosted source in all tests.

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 555 matching lines @@
 /// met than just failing in the middle of a test when pub invokes git.
 ///
 /// This also increases the [Schedule] timeout to 30 seconds on Windows,
 /// where Git runs really slowly.
 void ensureGit() {
   if (!gitlib.isInstalled) {
     throw new Exception("Git must be installed to run this test.");
   }
 }
 
-/// Schedules activating a global package [package] without running
-/// "pub global activate".
-///
-/// This is useful because global packages must be hosted, but the test hosted
-/// server doesn't serve barback. The other parameters here follow
-/// [createLockFile].
-void makeGlobalPackage(String package, String version,
-    Iterable<d.Descriptor> contents, {Iterable<String> pkg,
-    Map<String, String> hosted}) {
-  // Start the server so we know what port to use in the cache directory name.
-  serveNoPackages();
-
-  // Create the package in the hosted cache.
-  d.hostedCache([
-    d.dir("$package-$version", contents)
-  ]).create();
-
-  // Write the lockfile to the global cache.
-  var cache = new SystemCache.withSources(
-      rootDir: p.join(sandboxDir, cachePath));
-
-  var lockFile = _createLockFile(cache.sources, pkg: pkg, hosted: hosted);
-
-  // Add the root package to the lockfile.
-  var id = new PackageId(package, "hosted", new Version.parse(version),
-      package);
-  lockFile = lockFile.setPackage(id);
-
-  d.dir(cachePath, [
-    d.dir("global_packages", [
-      d.dir(package, [
-        d.file("pubspec.lock", lockFile.serialize(null)),
-        d.file(".packages", lockFile.packagesFile())
-      ])
-    ])
-  ]).create();
-}
-
 /// Creates a lock file for [package] without running `pub get`.
 ///
 /// [sandbox] is a list of path dependencies to be found in the sandbox
 /// directory. [pkg] is a list of packages in the Dart repo's "pkg" directory;
 /// each package listed here and all its dependencies will be linked to the
 /// version in the Dart repo.
 ///
 /// [hosted] is a list of package names to version strings for dependencies on
 /// hosted packages.
 void createLockFile(String package, {Iterable<String> sandbox,
-    Iterable<String> pkg, Map<String, String> hosted}) {
+    Map<String, String> hosted}) {
   schedule(() async {
     var cache = new SystemCache.withSources(
         rootDir: p.join(sandboxDir, cachePath));
 
     var lockFile = _createLockFile(cache.sources,
-        sandbox: sandbox, pkg: pkg, hosted: hosted);
+        sandbox: sandbox, hosted: hosted);
 
     await d.dir(package, [
       d.file('pubspec.lock', lockFile.serialize(null)),
       d.file('.packages', lockFile.packagesFile(package))
     ]).create();
   }, "creating lockfile for $package");
 }
 
 /// Like [createLockFile], but creates only a `.packages` file without a
 /// lockfile.
 void createPackagesFile(String package, {Iterable<String> sandbox,
-    Iterable<String> pkg, Map<String, String> hosted}) {
+    Map<String, String> hosted}) {
   schedule(() async {
     var cache = new SystemCache.withSources(
         rootDir: p.join(sandboxDir, cachePath));
 
     var lockFile = _createLockFile(cache.sources,
-        sandbox: sandbox, pkg: pkg, hosted: hosted);
+        sandbox: sandbox, hosted: hosted);
 
     await d.dir(package, [
       d.file('.packages', lockFile.packagesFile(package))
     ]).create();
   }, "creating .packages for $package");
 }
 
 /// Creates a lock file for [package] without running `pub get`.
 ///
 /// [sandbox] is a list of path dependencies to be found in the sandbox
 /// directory. [pkg] is a list of packages in the Dart repo's "pkg" directory;
 /// each package listed here and all its dependencies will be linked to the
 /// version in the Dart repo.
 ///
 /// [hosted] is a list of package names to version strings for dependencies on
 /// hosted packages.
 LockFile _createLockFile(SourceRegistry sources, {Iterable<String> sandbox,
-    Iterable<String> pkg, Map<String, String> hosted}) {
+    Map<String, String> hosted}) {
   var dependencies = {};
 
   if (sandbox != null) {
     for (var package in sandbox) {
       dependencies[package] = '../$package';
     }
   }
 
-  if (pkg != null) {
-    _addPackage(String package) {
-      if (dependencies.containsKey(package)) return;
-
-      var path = packagePath(package);
-      dependencies[package] = path;
-      var pubspec = loadYaml(
-          readTextFile(p.join(path, 'pubspec.yaml')));
-      var packageDeps = pubspec['dependencies'];
-      if (packageDeps == null) return;
-      packageDeps.keys.forEach(_addPackage);
-    }
-
-    pkg.forEach(_addPackage);
-  }
-
   var packages = dependencies.keys.map((name) {
     var dependencyPath = dependencies[name];
     return new PackageId(name, 'path', new Version(0, 0, 0), {
       'path': dependencyPath,
       'relative': p.isRelative(dependencyPath)
     });
   }).toList();
 
   if (hosted != null) {
     hosted.forEach((name, version) {
@@ skipping 215 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"));