Index: tests/git_cl_test.py |
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py |
index 82a404ccc4abed4d5f96257abafd405d6eeec24c..02629bcf37182629ac7c6a4407f6b61533e20ec6 100755 |
--- a/tests/git_cl_test.py |
+++ b/tests/git_cl_test.py |
@@ -1396,7 +1396,7 @@ class TestGitCl(TestCase): |
] |
# TODO(tandrii): consider testing just set-commit and set-commit --clear, |
# but without copy-pasting tons of expectations, as modifying them later is |
- # super tedious. |
+#super tedious. |
M-A Ruel
2016/06/01 12:43:17
oops
Kevin M
2016/06/01 17:49:05
Done.
|
self.assertEqual(0, git_cl.main(['set-commit', '-d'])) |
def test_description_display(self): |
@@ -1454,6 +1454,64 @@ class TestGitCl(TestCase): |
self.assertEqual(0, git_cl.main(['description', '-n', '-'])) |
self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc) |
+ def test_cleanup(self): |
+ self.calls = \ |
+ [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
+ 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
+ ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
+ ((['git', 'config', 'rietveld.autoupdate'],), ''), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'config', 'branch.bar.rietveldissue'],), ''), |
+ ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
+ ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
+ ((['git', 'tag', 'git-cl-closed-456-foo', 'foo'],), ''), |
+ ((['git', 'branch', '-D', 'foo'],), '')] |
+ |
+ class MockChangelist(): |
+ def __init__(self, branch, issue): |
+ self.branch = branch |
+ self.issue = issue |
+ def GetBranch(self): |
+ return self.branch |
+ def GetIssue(self): |
+ return self.issue |
+ |
+ self.mock(git_cl, 'get_cl_statuses', |
+ lambda branches, fine_grained, max_processes: |
+ [(MockChangelist('master', 1), 'open'), |
+ (MockChangelist('foo', 456), 'closed'), |
+ (MockChangelist('bar', 789), 'open')]) |
+ |
+ self.assertEqual(0, git_cl.main(['cleanup', '-f'])) |
+ |
+ def test_cleanup_current_branch_fails(self): |
+ self.calls = \ |
+ [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
+ 'refs/heads/master'), |
+ ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
+ ((['git', 'config', 'rietveld.autoupdate'],), ''), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'config', 'rietveld.server'],), ''), |
+ ((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
+ |
+ class MockChangelist(): |
+ def __init__(self, branch, issue): |
+ self.branch = branch |
+ self.issue = issue |
+ def GetBranch(self): |
+ return self.branch |
+ def GetIssue(self): |
+ return self.issue |
+ |
+ self.mock(git_cl, 'get_cl_statuses', |
+ lambda branches, fine_grained, max_processes: |
+ [(MockChangelist('master', 1), 'closed')]) |
+ |
+ self.assertEqual(1, git_cl.main(['cleanup', '-f'])) |
if __name__ == '__main__': |
git_cl.logging.basicConfig( |