Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/pending_manager_test.py

Issue 13483026: Change the CQ code to update R= line as done in depot_tools. (Closed) Base URL: https://git.chromium.org/chromium/tools/commit-queue.git@2_common
Patch Set: Fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pending_manager.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/pending_manager_test.py
diff --git a/tests/pending_manager_test.py b/tests/pending_manager_test.py
index cd8c46496b5244e064de774cb4c59413a5827361..e72ae372f8a976fdcde3b98f29b646c981072aa9 100755
--- a/tests/pending_manager_test.py
+++ b/tests/pending_manager_test.py
@@ -99,13 +99,13 @@ class TestPendingManager(mocks.TestCase):
'prepare(None)', # Will sync to HEAD/124.
'apply_patch(%r)' % (self.context.rietveld.patchsets[1],),
(
- "commit(u'foo\\n\\n"
+ "commit(u'foo\\n\\nR=rev@example.com\\n\\n"
"Review URL: http://nowhere/%d', "
"u'author@example.com')") % issue])
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
else:
self.context.checkout.check_calls(
@@ -122,7 +122,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
else:
# checkout is never touched in that case.
@@ -154,9 +154,9 @@ class TestPendingManager(mocks.TestCase):
author_and_reviewer = ''
if server_hooks_missing:
author_and_reviewer = (
- '\\n\\nR=rev@example.com\\n\\nAuthor: author@example.com')
+ '\\n\\nAuthor: author@example.com')
commit_message = (
- "commit(u'foo%s\\n\\n"
+ "commit(u'foo\\n\\nR=rev@example.com%s\\n\\n"
"Review URL: http://nowhere/%d', "
"u'author@example.com')") % (author_and_reviewer, issue)
seq.append(commit_message)
@@ -445,7 +445,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['initial', 'why not', 'commit'])
@@ -478,16 +478,16 @@ class TestPendingManager(mocks.TestCase):
_try_comment(5),
_try_comment(),
'close_issue(0)',
- "update_description(0, u'foo')",
+ "update_description(0, u'foo\\n\\nR=rev@example.com')",
"add_comment(0, 'Change committed as 125')",
'close_issue(1)',
- "update_description(1, u'foo')",
+ "update_description(1, u'foo\\n\\nR=rev@example.com')",
"add_comment(1, 'Change committed as 125')",
'close_issue(2)',
- "update_description(2, u'foo')",
+ "update_description(2, u'foo\\n\\nR=rev@example.com')",
"add_comment(2, 'Change committed as 125')",
'close_issue(3)',
- "update_description(3, u'foo')",
+ "update_description(3, u'foo\\n\\nR=rev@example.com')",
"add_comment(3, 'Change committed as 125')",
])
self.assertEquals(3, len(pc.queue.iterate()))
@@ -511,7 +511,7 @@ class TestPendingManager(mocks.TestCase):
self._prepare_apply_commit(next_item, next_item))
self.context.rietveld.check_calls(
[ 'close_issue(%d)' % next_item,
- "update_description(%d, u'foo')" % next_item,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % next_item,
"add_comment(%d, 'Change committed as 125')" % next_item,
])
self.context.status.check_names(['why not', 'commit'] + ['why not'] * 2)
@@ -523,10 +523,11 @@ class TestPendingManager(mocks.TestCase):
self._prepare_apply_commit(next_item + 2, issue))
self.context.rietveld.check_calls(
[ 'close_issue(%d)' % (next_item + 1),
- "update_description(%d, u'foo')" % (next_item + 1),
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" %
+ (next_item + 1),
"add_comment(%d, 'Change committed as 125')" % (next_item + 1),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['why not', 'commit'] * 2)
@@ -562,7 +563,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['initial', 'why not', 'commit'])
self.context.checkout.check_calls(
@@ -642,7 +643,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['initial', 'why not', 'commit'])
self.context.checkout.check_calls(
@@ -682,7 +683,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[ _try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['initial', 'why not', 'commit'])
self.context.checkout.check_calls(
@@ -714,7 +715,7 @@ class TestPendingManager(mocks.TestCase):
self.context.rietveld.check_calls(
[_try_comment(),
'close_issue(%d)' % issue,
- "update_description(%d, u'foo')" % issue,
+ "update_description(%d, u'foo\\n\\nR=rev@example.com')" % issue,
"add_comment(%d, 'Change committed as 125')" % issue])
self.context.status.check_names(['why not', 'commit'])
self.context.checkout.check_calls(
« no previous file with comments | « pending_manager.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698