[recipe_engine] Fix a couple path-related bugs.

unittests/repo_test_util.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Utilities for testing with real repos (e.g. git)."""
 
 
 import contextlib
 import os
 import shutil
@@ skipping 95 matching lines @@
   def repo_setup(self, repo_deps):
     """Creates a set of repos with recipes.cfg reflecting requested
     dependencies.
 
     In order to avoid a topsort, we require that repo names are in
     alphebetical dependency order -- i.e. later names depend on earlier
     ones.
     """
     repos = {}
     for k in sorted(repo_deps):
+      deps=[package_pb2.DepSpec(
+          project_id='recipe_engine',
+          url="file://"+ROOT_DIR,
+      )] + [
+        package_pb2.DepSpec(
+          project_id=d,
+          url=repos[d]['root'],
+          branch='master',
+          revision=repos[d]['revision'],
+        )
+        for d in repo_deps[k]
+      ]
+
       repos[k] = self.create_repo(k, package_pb2.Package(
           api_version=1,
           project_id=k,
           recipes_path='',
-          deps=[
-              package_pb2.DepSpec(
-                  project_id=d,
-                  url=repos[d]['root'],
-                  branch='master',
-                  revision=repos[d]['revision'],
-              )
-              for d in repo_deps[k]
-          ],
+          deps=deps,
       ))
     return repos
 
   def updated_package_spec_pb(self, repo, dep_name, dep_revision):
     """Returns package spec for given repo, with specified revision
     for given dependency.
     """
     spec = self.get_package_spec(repo)
     spec.deps[dep_name].revision = dep_revision
     return spec.dump()
@@ skipping 149 matching lines @@
       message = ' '.join(
         ['update %r recipe_module: ' % name] +
         ['%s(%s)' % t for t in methods.iteritems()]
       )
       return self.commit_in_repo(repo, message)
 
   def reset_repo(self, repo, revision):
     """Resets repo contents to given revision."""
     with in_directory(repo['root']):
       subprocess.check_output(['git', 'reset', '--hard', revision])