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

[Martin Packman]

Fix broken tests for git gate script

Changed arg handling added a new restriction that the test cases had not picked up the adaptation for.

[John George (jog)]

Thank you

review: Approve

=== modified file 'test_git_gate.py'
--- test_git_gate.py	2015-03-24 18:48:23 +0000
+++ test_git_gate.py	2015-03-30 18:54:24 +0000
@@ -6,20 +6,23 @@
 
 class TestParseArgs(unittest.TestCase):
 
-    def test_project_only(self):
-        args = git_gate.parse_args(["--project", "git.testing/project"])
+    def test_project_and_url(self):
+        args = git_gate.parse_args(
+            ["--project", "git.testing/project",
+             "--project-url", "https://git.testing/project"])
         self.assertEqual(args.project, "git.testing/project")
+        self.assertEqual(args.project_url, "https://git.testing/project")
 
     def test_project_and_ref(self):
         args = git_gate.parse_args(
-            ["--project", "git.testing/project",
+            ["--project", "git.testing/project", "--go-get-all",
              "--project-ref", "v1"])
         self.assertEqual(args.project, "git.testing/project")
         self.assertEqual(args.project_ref, "v1")
 
     def test_merging_other(self):
         args = git_gate.parse_args(
-            ["--project", "git.testing/project",
+            ["--project", "git.testing/project", "--go-get-all",
              "--merge-url", "git.testing/proposed"])
         self.assertEqual(args.project, "git.testing/project")
         self.assertEqual(args.merge_url, "git.testing/proposed")
@@ -27,7 +30,7 @@
 
     def test_merging_other_ref(self):
         args = git_gate.parse_args(
-            ["--project", "git.testing/project",
+            ["--project", "git.testing/project", "--go-get-all",
              "--merge-url", "git.testing/proposed", "--merge-ref", "feature"])
         self.assertEqual(args.project, "git.testing/project")
         self.assertEqual(args.merge_url, "git.testing/proposed")
@@ -36,8 +39,10 @@
     def test_project_with_deps(self):
         args = git_gate.parse_args(
             ["--project", "git.testing/project",
+             "--project-url", "https://git.testing/project",
              "--dependencies", "git.testing/a", "git.testing/b"])
         self.assertEqual(args.project, "git.testing/project")
+        self.assertEqual(args.project_url, "https://git.testing/project")
         self.assertEqual(args.dependencies, ["git.testing/a", "git.testing/b"])
         self.assertEqual(args.go_get_all, False)