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

[Martin Packman]

Second pass at making subproject feature branches sane

Mostly just cleanup to Nate's existing change, adds new argument to explictly turn on the behaviour.

=== modified file 'git_gate.py'
--- git_gate.py	2015-12-11 22:10:05 +0000
+++ git_gate.py	2015-12-12 01:33:22 +0000
@@ -50,9 +50,12 @@
     go = SubcommandRunner("go", goenv)
     git = SubcommandRunner("git")
 
-    project_dir = from_feature_dir(args.project)
-    project_ellipsis = project_dir + "/..."
-    directory = os.path.join(gopath, "src", project_dir)
+    final_project = args.project
+    if args.feature_branch:
+        final_project = from_feature_dir(args.project)
+
+    project_ellipsis = final_project + "/..."
+    directory = os.path.join(gopath, "src", final_project)
 
     if args.tsv_path:
         print_now("Getting and installing godeps")
@@ -60,8 +63,7 @@
         go("install", "launchpad.net/godeps/...")
     if args.project_url:
         reldir = os.path.relpath(directory, gopath)
-        print_now("Cloning {} from {} to {}".format(args.project,
-                                                    args.project_url, reldir))
+        print_now("Cloning {} from {}".format(final_project, args.project_url))
         git("clone", args.project_url, directory)
     if args.go_get_all and not (args.project_url and args.merge_url):
         print_now("Getting {} and dependencies using go".format(args.project))
@@ -124,6 +126,9 @@
         "--project-url", help="URL to git repository of package.")
     project_group.add_argument(
         "--project-ref", help="Branch name or tag to use as basis.")
+    project_group.add_argument(
+        "--feature-branch", action="store_true",
+        help="Use special handling for pending feature branches.")
     merge_group = parser.add_argument_group()
     merge_group.add_argument(
         "--merge-url", help="URL to git repository to merge before testing.")
@@ -143,6 +148,8 @@
     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")
+    if args.feature_branch and args.go_get_all:
+        parser.error("Cannot use --feature-branch and --go-get-all together")
     return args
 
 

=== modified file 'tests/test_git_gate.py'
--- tests/test_git_gate.py	2015-12-11 22:10:05 +0000
+++ tests/test_git_gate.py	2015-12-12 01:33:22 +0000
@@ -1,12 +1,12 @@
 import argparse
 import mock
 import subprocess
-import unittest
 
 import git_gate
-
-
-class TestParseArgs(unittest.TestCase):
+import tests
+
+
+class TestParseArgs(tests.TestCase):
 
     def test_project_and_url(self):
         args = git_gate.parse_args(
@@ -77,8 +77,25 @@
         self.assertEqual(args.go_get_all, False)
         self.assertEqual(args.tsv_path, "/a/file.tsv")
 
-
-class TestSubcommandError(unittest.TestCase):
+    def test_error_on_project_url_missing(self):
+        with tests.parse_error(self) as stderr:
+            git_gate.parse_args(["--project", "git.testing/project"])
+        self.assertIn(
+            "Must supply either --project-url or --go-get-all",
+            stderr.getvalue())
+
+    def test_error_go_get_feature_branch(self):
+        with tests.parse_error(self) as stderr:
+            git_gate.parse_args(
+                ["--project", "git.testing/project",
+                 "--project-url", "https://git.testing/project",
+                 "--go-get-all", "--feature-branch"])
+        self.assertIn(
+            "Cannot use --feature-branch and --go-get-all together",
+            stderr.getvalue())
+
+
+class TestSubcommandError(tests.TestCase):
 
     def test_subcommand_error(self):
         proc_error = subprocess.CalledProcessError(1, ["git"])
@@ -86,7 +103,7 @@
         self.assertEqual(str(err), "Subprocess git clone failed with code 1")
 
 
-class TestGoTest(unittest.TestCase):
+class TestGoTest(tests.TestCase):
     """
     Tests for go_test function.
 
@@ -99,6 +116,7 @@
     maxDiff = None
 
     def setUp(self):
+        super(TestGoTest, self).setUp()
         # Patch out and record actions run as part of go_test()
         self.actions = []
         self.patch_action("git_gate.print_now", lambda s: ("print", s))
@@ -127,8 +145,8 @@
         patcher.start()
         self.addCleanup(patcher.stop)
 
-    args = frozenset("project project_url project_ref merge_url merge_ref"
-                     " go_get_all dependencies tsv_path".split())
+    args = frozenset("project project_url project_ref feature_branch merge_url"
+                     " merge_ref go_get_all dependencies tsv_path".split())
 
     @classmethod
     def make_args(cls, project, **kwargs):
@@ -176,7 +194,7 @@
         git_gate.go_test(args, "/tmp/fake")
         self.assertEqual(self.actions, [
             ('print', 'Cloning git.testing/project from'
-             ' https://git.testing/project to src/git.testing/project'),
+             ' https://git.testing/project'),
             ('git', 'clone', 'https://git.testing/project',
              '/tmp/fake/src/git.testing/project'),
             ('chdir', '/tmp/fake/src/git.testing/project'),
@@ -198,7 +216,7 @@
         git_gate.go_test(args, "/tmp/fake")
         self.assertEqual(self.actions, [
             ('print', 'Cloning git.testing/project from'
-             ' https://git.testing/project to src/git.testing/project'),
+             ' https://git.testing/project'),
             ('git', 'clone', 'https://git.testing/project',
              '/tmp/fake/src/git.testing/project'),
             ('chdir', '/tmp/fake/src/git.testing/project'),
@@ -220,7 +238,7 @@
             ('go', 'get', '-v', '-d', 'launchpad.net/godeps/...'),
             ('go', 'install', 'launchpad.net/godeps/...'),
             ('print', 'Cloning git.testing/project from'
-             ' https://git.testing/project to src/git.testing/project'),
+             ' https://git.testing/project'),
             ('git', 'clone', 'https://git.testing/project',
              '/tmp/fake/src/git.testing/project'),
             ('chdir', '/tmp/fake/src/git.testing/project'),
@@ -232,11 +250,45 @@
             ('go', 'test', 'git.testing/project/...')
         ])
 
-
-class TestFromFeatureDir(unittest.TestCase):
-    """
-    Tests for from_feature_dir function.
-    """
+    def test_feature_branch(self):
+        args = self.make_args("vgo.testing/project.v2.feature",
+                              project_url="https://git.testing/project",
+                              project_ref="v2.feature",
+                              feature_branch=True, dependencies=[])
+        git_gate.go_test(args, "/tmp/fake")
+        self.assertEqual(self.actions, [
+            ('print', 'Cloning vgo.testing/project.v2 from'
+             ' https://git.testing/project'),
+            ('git', 'clone', 'https://git.testing/project',
+             '/tmp/fake/src/vgo.testing/project.v2'),
+            ('chdir', '/tmp/fake/src/vgo.testing/project.v2'),
+            ('print', 'Switching repository to v2.feature'),
+            ('git', 'checkout', 'v2.feature'),
+            ('go', 'build', 'vgo.testing/project.v2/...'),
+            ('go', 'test', 'vgo.testing/project.v2/...')
+        ])
+
+    def test_no_magic_dots(self):
+        args = self.make_args("vgo.testing/project.dot.love",
+                              project_url="https://git.testing/project",
+                              project_ref="dot.love", dependencies=[])
+        git_gate.go_test(args, "/tmp/fake")
+        self.assertEqual(self.actions, [
+            ('print', 'Cloning vgo.testing/project.dot.love from'
+             ' https://git.testing/project'),
+            ('git', 'clone', 'https://git.testing/project',
+             '/tmp/fake/src/vgo.testing/project.dot.love'),
+            ('chdir', '/tmp/fake/src/vgo.testing/project.dot.love'),
+            ('print', 'Switching repository to dot.love'),
+            ('git', 'checkout', 'dot.love'),
+            ('go', 'build', 'vgo.testing/project.dot.love/...'),
+            ('go', 'test', 'vgo.testing/project.dot.love/...')
+        ])
+
+
+class TestFromFeatureDir(tests.TestCase):
+    """Tests for from_feature_dir function."""
+
     def test_boring(self):
         directory = git_gate.from_feature_dir("github.com/juju/juju")
         self.assertEqual(directory, "github.com/juju/juju")