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

Unified Diff: tests/trychange_unittest.py

Issue 524046: Add "diff against" support when sending try patches. (Closed)
Patch Set: Created 10 years, 11 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
« scm.py ('K') | « scm.py ('k') | trychange.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/trychange_unittest.py
diff --git a/tests/trychange_unittest.py b/tests/trychange_unittest.py
index 5d1493eac6ee2fa409dbcd100d5bf22b27d9d8f8..dbaa763b23284a1966a4f9f1cc43dbeec6a06972 100644
--- a/tests/trychange_unittest.py
+++ b/tests/trychange_unittest.py
@@ -63,8 +63,10 @@ class SVNUnittest(TryChangeTestsBase):
def testBasic(self):
trychange.scm.SVN.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
- trychange.scm.SVN.GenerateDiff(['foo.txt', 'bar.txt'], self.fake_root,
- full_move=True).AndReturn('A diff')
+ trychange.scm.SVN.GenerateDiff(['foo.txt', 'bar.txt'],
+ self.fake_root,
+ full_move=True,
+ revision=None).AndReturn('A diff')
trychange.scm.SVN.GetEmail(self.fake_root).AndReturn('georges@example.com')
self.mox.ReplayAll()
svn = trychange.SVN(self.options, self.fake_root)
@@ -87,7 +89,8 @@ class GITUnittest(TryChangeTestsBase):
def testBasic(self):
trychange.scm.GIT.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
trychange.scm.GIT.GenerateDiff(self.fake_root,
- full_move=True).AndReturn('A diff')
+ full_move=True,
+ branch=None).AndReturn('A diff')
trychange.scm.GIT.GetPatchName(self.fake_root).AndReturn('bleh-1233')
trychange.scm.GIT.GetEmail(self.fake_root).AndReturn('georges@example.com')
self.mox.ReplayAll()
« scm.py ('K') | « scm.py ('k') | trychange.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698