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

Unified Diff: tests/gcl_unittest.py

Issue 504085: Add --sup_rep support to trychange.py. (Closed)
Patch Set: Created 11 years 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 | « scm.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gcl_unittest.py
diff --git a/tests/gcl_unittest.py b/tests/gcl_unittest.py
index 64f5f63427855c84ef1cc2195355fc19e0fa2fc8..e7ba5923844d4464c5205f194b45fb6e532e1e8f 100755
--- a/tests/gcl_unittest.py
+++ b/tests/gcl_unittest.py
@@ -17,10 +17,12 @@ class GclTestsBase(SuperMoxTestBase):
self.fake_root_dir = self.RootDir()
self.mox.StubOutWithMock(gcl, 'RunShell')
self.mox.StubOutWithMock(gcl.SVN, 'CaptureInfo')
+ self.mox.StubOutWithMock(gcl.SVN, 'GetCheckoutRoot')
self.mox.StubOutWithMock(gcl, 'tempfile')
self.mox.StubOutWithMock(gcl.upload, 'RealMain')
self.mox.StubOutWithMock(gcl.gclient_utils, 'FileRead')
self.mox.StubOutWithMock(gcl.gclient_utils, 'FileWrite')
+ gcl.REPOSITORY_ROOT = None
class GclUnittest(GclTestsBase):
@@ -60,26 +62,17 @@ class GclUnittest(GclTestsBase):
pass
def testGetRepositoryRootNone(self):
- gcl.REPOSITORY_ROOT = None
- gcl.os.getcwd().AndReturn("/bleh/prout")
- result = {
- "Repository Root": ""
- }
- gcl.SVN.CaptureInfo("/bleh/prout", print_error=False).AndReturn(result)
+ gcl.os.getcwd().AndReturn(self.fake_root_dir)
+ gcl.SVN.GetCheckoutRoot(self.fake_root_dir).AndReturn(None)
self.mox.ReplayAll()
- self.assertRaises(Exception, gcl.GetRepositoryRoot)
+ self.assertRaises(gcl.gclient_utils.Error, gcl.GetRepositoryRoot)
def testGetRepositoryRootGood(self):
- gcl.REPOSITORY_ROOT = None
root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
gcl.os.getcwd().AndReturn(root_path)
- result1 = { "Repository Root": "Some root" }
- gcl.SVN.CaptureInfo(root_path, print_error=False).AndReturn(result1)
- results2 = { "Repository Root": "A different root" }
- gcl.SVN.CaptureInfo(gcl.os.path.dirname(root_path),
- print_error=False).AndReturn(results2)
+ gcl.SVN.GetCheckoutRoot(root_path).AndReturn(root_path + '.~')
bradn 2009/12/22 20:38:47 Shouldn't this be an os.path.join ? Why add the .
self.mox.ReplayAll()
- self.assertEquals(gcl.GetRepositoryRoot(), root_path)
+ self.assertEquals(gcl.GetRepositoryRoot(), root_path + '.~')
def testGetCachedFile(self):
# TODO(maruel): TEST ME
« no previous file with comments | « scm.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698