Spit pub tests into smaller suites.

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.
  */
@@ skipping 483 matching lines @@
     // test framework knows we're done doing asynchronous stuff.
     cleanup().then((_) => registerException(error, future.stackTrace));
     return true;
   });
 
   future.chain((_) => cleanup()).then((_) {
     asyncDone();
   });
 }
 
+/// Get the path to the root "util/test/pub" directory containing the pub tests.
+String get testDirectory {
+  var dir = new Path.fromNative(new Options().script);
+  while (dir.filename != 'pub') dir = dir.directoryPath;
+
+  return dir.toNativePath();
+}
+
 /**
  * Schedules a call to the Pub command-line utility. Runs Pub with [args] and
  * validates that its results match [output], [error], and [exitCode].
  */
 void schedulePub([List<String> args, Pattern output, Pattern error,
     int exitCode = 0]) {
   _schedule((sandboxDir) {
     String pathInSandbox(path) => join(getFullPath(sandboxDir), path);
 
     return ensureDir(pathInSandbox(appPath)).chain((_) {
       // Find a Dart executable we can use to spawn. Use the same one that was
       // used to run this script itself.
       var dartBin = new Options().executable;
 
       // If the executable looks like a path, get its full path. That way we
       // can still find it when we spawn it with a different working directory.
       if (dartBin.contains(Platform.pathSeparator)) {
         dartBin = new File(dartBin).fullPathSync();
       }
 
-      var scriptDir = new File(new Options().script).directorySync().path;
-
       // Find the main pub entrypoint.
-      var pubPath = fs.joinPaths(scriptDir, '../../pub/pub.dart');
+      var pubPath = fs.joinPaths(testDirectory, '../../pub/pub.dart');
 
       var dartArgs =
           ['--enable-type-checks', '--enable-asserts', pubPath, '--trace'];
       dartArgs.addAll(args);
 
       var environment = new Map.from(Platform.environment);
       environment['PUB_CACHE'] = pathInSandbox(cachePath);
       environment['DART_SDK'] = pathInSandbox(sdkPath);
 
       return runProcess(dartBin, dartArgs, workingDir: pathInSandbox(appPath),
@@ skipping 119 matching lines @@
 
     Expect.fail(message.toString());
   }
 }
 
 /**
  * Base class for [FileDescriptor] and [DirectoryDescriptor] so that a
  * directory can contain a heterogeneous collection of files and
  * subdirectories.
  */
-class Descriptor {
+abstract class Descriptor {
   /**
    * The name of this file or directory. This must be a [String] if the fiel or
    * directory is going to be created.
    */
   final Pattern name;
 
   Descriptor(this.name);
 
   /**
    * Creates the file or directory within [dir]. Returns a [Future] that is
@@ skipping 360 matching lines @@
             "--file", join(parentDir, _stringName)];
         args.addAll(contents.map((child) => child.name));
         return runProcess("tar", args);
       } else {
         // Create the tar file.
         var tarFile = join(tempDir, _stringName.replaceAll("tar.gz", "tar"));
         var args = ["a", tarFile];
         args.addAll(contents.map(
             (child) => '-i!"${join(tempDir, child.name)}"'));
 
-        // Find 7zip. Note: this assumes the tests are being run from
-        // utils/tests/pub/
-        var scriptDir = new File(new Options().script).directorySync().path;
-        var command = fs.joinPaths(scriptDir,
+        // Find 7zip.
+        var command = fs.joinPaths(testDirectory,
             '../../../third_party/7zip/7za.exe');
 
         return runProcess(command, args).chain((_) {
           // GZIP it. 7zip doesn't support doing both as a single operation.
           args = ["a", join(parentDir, _stringName), tarFile];
           return runProcess(command, args);
         });
       }
     }).chain((result) {
       if (!result.success) {
         throw "Failed to create tar file $name.\n"
             "STDERR: ${Strings.join(result.stderr, "\n")}";
       }
       return deleteDir(tempDir);
     }).transform((_) {
       return new File(join(parentDir, _stringName));
     });
   }
 
   /**
    * Validates that the `.tar.gz` file at [path] contains the expected contents.
    */
   Future validate(String path) {
     throw "TODO(nweiz): implement this";
   }
 
+  Future delete(dir) {
+    throw new UnsupportedOperationException('');
+  }
+
   /**
    * Loads the contents of this tar file.
    */
   InputStream load(List<String> path) {
     if (!path.isEmpty()) {
       var joinedPath = Strings.join(path, '/');
       throw "Can't load $joinedPath from within $name: not a directory.";
     }
 
     var sinkStream = new ListInputStream();
@@ skipping 70 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);
 }