Revert "Use scheduled_test for Pub tests."

utils/tests/pub/install/git/check_out_and_update_test.dart

Index: utils/tests/pub/install/git/check_out_and_update_test.dart
diff --git a/utils/tests/pub/install/git/check_out_and_update_test.dart b/utils/tests/pub/install/git/check_out_and_update_test.dart
index 14e65c70d2cc6cd080497f4440335e106acc97be..22fed5013e6a0c22e7009774d5af9da80c67ee39 100644
--- a/utils/tests/pub/install/git/check_out_and_update_test.dart
+++ b/utils/tests/pub/install/git/check_out_and_update_test.dart
@@ -6,58 +6,61 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
   integration('checks out and updates a package from Git', () {
     ensureGit();
 
-    d.git('foo.git', [
-      d.libDir('foo'),
-      d.libPubspec('foo', '1.0.0')
-    ]).create();
+    git('foo.git', [
+      libDir('foo'),
+      libPubspec('foo', '1.0.0')
+    ]).scheduleCreate();
 
-    d.appDir([{"git": "../foo.git"}]).create();
+    appDir([{"git": "../foo.git"}]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.dir(cachePath, [
-      d.dir('git', [
-        d.dir('cache', [d.gitPackageRepoCacheDir('foo')]),
-        d.gitPackageRevisionCacheDir('foo')
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [gitPackageRepoCacheDir('foo')]),
+        gitPackageRevisionCacheDir('foo')
       ])
-    ]).validate();
+    ]).scheduleValidate();
 
-    d.dir(packagesPath, [
-      d.dir('foo', [
-        d.file('foo.dart', 'main() => "foo";')
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
 
-    d.git('foo.git', [
-      d.libDir('foo', 'foo 2'),
-      d.libPubspec('foo', '1.0.0')
-    ]).commit();
+    // TODO(nweiz): remove this once we support pub update
+    dir(packagesPath).scheduleDelete();
+    file('$appPath/pubspec.lock', '').scheduleDelete();
 
-    schedulePub(args: ['update'],
-        output: new RegExp(r"Dependencies updated!$"));
+    git('foo.git', [
+      libDir('foo', 'foo 2'),
+      libPubspec('foo', '1.0.0')
+    ]).scheduleCommit();
+
+    schedulePub(args: ['install'],
+        output: new RegExp(r"Dependencies installed!$"));
 
     // When we download a new version of the git package, we should re-use the
     // git/cache directory but create a new git/ directory.
-    d.dir(cachePath, [
-      d.dir('git', [
-        d.dir('cache', [d.gitPackageRepoCacheDir('foo')]),
-        d.gitPackageRevisionCacheDir('foo'),
-        d.gitPackageRevisionCacheDir('foo', 2)
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [gitPackageRepoCacheDir('foo')]),
+        gitPackageRevisionCacheDir('foo'),
+        gitPackageRevisionCacheDir('foo', 2)
       ])
-    ]).validate();
+    ]).scheduleValidate();
 
-    d.dir(packagesPath, [
-      d.dir('foo', [
-        d.file('foo.dart', 'main() => "foo 2";')
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo 2";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
   });
 }