Merge lp:~gz/juju-ci-tools/tsv_project_relative into lp:juju-ci-tools

[Curtis Hovey]

Support relative path of dependencies.tsv

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'git_gate.py'
--- git_gate.py	2015-12-12 01:31:25 +0000
+++ git_gate.py	2015-12-12 01:51:43 +0000
@@ -84,7 +84,7 @@
             print_now("Getting {} and dependencies using go".format(dep))
             go("get", "-v", "-d", dep)
     if args.tsv_path:
-        tsv_path = os.path.join(gopath, "src", args.tsv_path)
+        tsv_path = os.path.join(gopath, "src", final_project, args.tsv_path)
         print_now("Getting dependencies using godeps from {}".format(tsv_path))
         godeps = SubcommandRunner(os.path.join(gopath, "bin", "godeps"), goenv)
         godeps("-u", tsv_path)
@@ -144,7 +144,7 @@
         help="Go import path of package needed to for build or testing.")
     dep_group.add_argument(
         "--tsv-path",
-        help="Path to dependencies.tsv file for project relative to src dir.")
+        help="Path to dependencies.tsv file relative to project dir.")
     args = parser.parse_args(args)
     if args.project_url is None and not args.go_get_all:
         parser.error("Must supply either --project-url or --go-get-all")
 
=== modified file 'tests/test_git_gate.py'
--- tests/test_git_gate.py	2015-12-12 01:31:25 +0000
+++ tests/test_git_gate.py	2015-12-12 01:51:43 +0000
@@ -231,7 +231,7 @@
     def test_tsv_test(self):
         args = self.make_args("git.testing/project",
                               project_url="https://git.testing/project",
-                              tsv_path="git.testing/project/dependencies.tsv")
+                              tsv_path="dependencies.tsv")
         git_gate.go_test(args, "/tmp/fake")
         self.assertEqual(self.actions, [
             ('print', 'Getting and installing godeps'),