| Index: utils/tests/pub/install/git/unlock_if_incompatible_test.dart
 | 
| diff --git a/utils/tests/pub/install/git/unlock_if_incompatible_test.dart b/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
 | 
| index 47aa1386b0449322f4ec95aa6c953ade7b54234d..64d44068ccc9893bf87bd90efe014d138565721c 100644
 | 
| --- a/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
 | 
| +++ b/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
 | 
| @@ -6,6 +6,7 @@ library pub_tests;
 | 
|  
 | 
|  import 'dart:io';
 | 
|  
 | 
| +import '../../descriptor.dart' as d;
 | 
|  import '../../test_pub.dart';
 | 
|  
 | 
|  main() {
 | 
| @@ -13,36 +14,36 @@ main() {
 | 
|        'constraint', () {
 | 
|      ensureGit();
 | 
|  
 | 
| -    git('foo.git', [
 | 
| -      libDir('foo'),
 | 
| -      libPubspec('foo', '0.5.0')
 | 
| -    ]).scheduleCreate();
 | 
| +    d.git('foo.git', [
 | 
| +      d.libDir('foo'),
 | 
| +      d.libPubspec('foo', '0.5.0')
 | 
| +    ]).create();
 | 
|  
 | 
| -    appDir([{"git": "../foo.git"}]).scheduleCreate();
 | 
| +    d.appDir([{"git": "../foo.git"}]).create();
 | 
|  
 | 
|      schedulePub(args: ['install'],
 | 
|          output: new RegExp(r"Dependencies installed!$"));
 | 
|  
 | 
| -    dir(packagesPath, [
 | 
| -      dir('foo', [
 | 
| -        file('foo.dart', 'main() => "foo";')
 | 
| +    d.dir(packagesPath, [
 | 
| +      d.dir('foo', [
 | 
| +        d.file('foo.dart', 'main() => "foo";')
 | 
|        ])
 | 
| -    ]).scheduleValidate();
 | 
| +    ]).validate();
 | 
|  
 | 
| -    git('foo.git', [
 | 
| -      libDir('foo', 'foo 1.0.0'),
 | 
| -      libPubspec("foo", "1.0.0")
 | 
| -    ]).scheduleCommit();
 | 
| +    d.git('foo.git', [
 | 
| +      d.libDir('foo', 'foo 1.0.0'),
 | 
| +      d.libPubspec("foo", "1.0.0")
 | 
| +    ]).commit();
 | 
|  
 | 
| -    appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).scheduleCreate();
 | 
| +    d.appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).create();
 | 
|  
 | 
|      schedulePub(args: ['install'],
 | 
|          output: new RegExp(r"Dependencies installed!$"));
 | 
|  
 | 
| -    dir(packagesPath, [
 | 
| -      dir('foo', [
 | 
| -        file('foo.dart', 'main() => "foo 1.0.0";')
 | 
| +    d.dir(packagesPath, [
 | 
| +      d.dir('foo', [
 | 
| +        d.file('foo.dart', 'main() => "foo 1.0.0";')
 | 
|        ])
 | 
| -    ]).scheduleValidate();
 | 
| +    ]).validate();
 | 
|    });
 | 
|  }
 | 
| 
 |