Make pubspec.lock keep relative path if it is originally specified as relative in pubspec.yaml (iss…

sdk/lib/_internal/pub/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 14 matching lines @@
 // TODO(rnystrom): Using "gitlib" as the prefix here is ugly, but "git" collides
 // with the git descriptor method. Maybe we should try to clean up the top level
 // scope a bit?
 import '../lib/src/git.dart' as gitlib;
 import '../lib/src/http.dart';
 import '../lib/src/io.dart';
 import '../lib/src/lock_file.dart';
 import '../lib/src/log.dart' as log;
 import '../lib/src/package.dart';
 import '../lib/src/safe_http_server.dart';
+import '../lib/src/source/path.dart';
+import '../lib/src/source_registry.dart';
 import '../lib/src/system_cache.dart';
 import '../lib/src/utils.dart';
 import '../lib/src/validator.dart';
 import '../lib/src/version.dart';
 import 'descriptor.dart' as d;
 
 /// This should be called at the top of a test file to set up an appropriate
 /// test configuration for the machine running the tests.
 initConfig() {
   useCompactVMConfiguration();
@@ skipping 553 matching lines @@
 
   schedule(() {
     return gitlib.isInstalled.then((installed) {
       if (installed) return;
       if (runningOnBuildbot) return;
       currentSchedule.abort();
     });
   }, 'ensuring that Git is installed');
 }
 
+/// Lists all the sources required for tests.
+final SourceRegistry _sources = new SourceRegistry()
+  ..register(new PathSource());

[Bob Nystrom, 2013/10/28 22:13:32]

Since this is just used in one method, let's just make this local to
createLockFile(), at least for now.

[Anton Moiseev, 2013/11/03 11:11:43]

Done.

+
 /// Create a lock file for [package] without running `pub get`.
 ///
 /// This creates a lock file with only path dependencies. [sandbox] is a list of
 /// 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.
 void createLockFile(String package, {Iterable<String> sandbox,
     Iterable<String> pkg}) {
   var dependencies = {};
 
@@ skipping 23 matching lines @@
   }
 
   var lockFile = new LockFile.empty();
   dependencies.forEach((name, dependencyPath) {
     var id = new PackageId(name, 'path', new Version(0, 0, 0), {
       'path': dependencyPath,
       'relative': path.isRelative(dependencyPath)
     });
     lockFile.packages[name] = id;
   });
-  d.file(path.join(package, 'pubspec.lock'), lockFile.serialize()).create();
+  
+  d.file(path.join(package, 'pubspec.lock'),
+      lockFile.serialize(null, _sources)).create();
 }
 
 /// Use [client] as the mock HTTP client for this test.
 ///
 /// Note that this will only affect HTTP requests made via http.dart in the
 /// parent process.
 void useMockClient(MockClient client) {
   var oldInnerClient = httpClient.inner;
   httpClient.inner = client;
   currentSchedule.onComplete.schedule(() {
@@ skipping 174 matching lines @@
   bool matches(item, Map matchState) {
     if (item is! Pair) return false;
     return _firstMatcher.matches(item.first, matchState) &&
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }