juju-ci-tools

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

  1. fix_git_gate_tests
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: 914
Merged at revision: 914
Proposed branch: lp:~gz/juju-ci-tools/fix_git_gate_tests
Merge into: lp:juju-ci-tools
Diff against target: 50 lines (+10/-5)
1 file modified
test_git_gate.py (+10/-5)
To merge this branch: bzr merge lp:~gz/juju-ci-tools/fix_git_gate_tests
Reviewer Review Type Date Requested Status
John George (community) Approve
Review via email: mp+254626@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
John George (jog) wrote :

Thank you

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test_git_gate.py'
2--- test_git_gate.py 2015-03-24 18:48:23 +0000
3+++ test_git_gate.py 2015-03-30 18:54:24 +0000
4@@ -6,20 +6,23 @@
5
6 class TestParseArgs(unittest.TestCase):
7
8- def test_project_only(self):
9- args = git_gate.parse_args(["--project", "git.testing/project"])
10+ def test_project_and_url(self):
11+ args = git_gate.parse_args(
12+ ["--project", "git.testing/project",
13+ "--project-url", "https://git.testing/project"])
14 self.assertEqual(args.project, "git.testing/project")
15+ self.assertEqual(args.project_url, "https://git.testing/project")
16
17 def test_project_and_ref(self):
18 args = git_gate.parse_args(
19- ["--project", "git.testing/project",
20+ ["--project", "git.testing/project", "--go-get-all",
21 "--project-ref", "v1"])
22 self.assertEqual(args.project, "git.testing/project")
23 self.assertEqual(args.project_ref, "v1")
24
25 def test_merging_other(self):
26 args = git_gate.parse_args(
27- ["--project", "git.testing/project",
28+ ["--project", "git.testing/project", "--go-get-all",
29 "--merge-url", "git.testing/proposed"])
30 self.assertEqual(args.project, "git.testing/project")
31 self.assertEqual(args.merge_url, "git.testing/proposed")
32@@ -27,7 +30,7 @@
33
34 def test_merging_other_ref(self):
35 args = git_gate.parse_args(
36- ["--project", "git.testing/project",
37+ ["--project", "git.testing/project", "--go-get-all",
38 "--merge-url", "git.testing/proposed", "--merge-ref", "feature"])
39 self.assertEqual(args.project, "git.testing/project")
40 self.assertEqual(args.merge_url, "git.testing/proposed")
41@@ -36,8 +39,10 @@
42 def test_project_with_deps(self):
43 args = git_gate.parse_args(
44 ["--project", "git.testing/project",
45+ "--project-url", "https://git.testing/project",
46 "--dependencies", "git.testing/a", "git.testing/b"])
47 self.assertEqual(args.project, "git.testing/project")
48+ self.assertEqual(args.project_url, "https://git.testing/project")
49 self.assertEqual(args.dependencies, ["git.testing/a", "git.testing/b"])
50 self.assertEqual(args.go_get_all, False)
51

Subscribers

People subscribed via source and target branches