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

Unified Diff: tests/scm_unittest.py

Issue 6792060: Make more tests pass on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 9 years, 9 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
Index: tests/scm_unittest.py
diff --git a/tests/scm_unittest.py b/tests/scm_unittest.py
index bd2e1485f875222af28f5ce30caafca6375bcbef..1c214267c1935a9523c2e139d04eaa3ada5c8ef3 100755
--- a/tests/scm_unittest.py
+++ b/tests/scm_unittest.py
@@ -261,22 +261,27 @@ class RealSvnTest(fake_repos.FakeReposTestBase):
# Tests that work with a checkout.
def setUp(self):
super(RealSvnTest, self).setUp()
- self.FAKE_REPOS.set_up_svn()
- self.svn_root = scm.os.path.join(self.root_dir, 'base')
- scm.SVN.Capture(
- ['checkout', self.svn_base + 'trunk/third_party', 'base'],
- cwd=self.root_dir)
- self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
+ self.enabled = self.FAKE_REPOS.set_up_svn()
+ if self.enabled:
+ self.svn_root = scm.os.path.join(self.root_dir, 'base')
+ scm.SVN.Capture(
+ ['checkout', self.svn_base + 'trunk/third_party', 'base'],
+ cwd=self.root_dir)
+ self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
def _capture(self, cmd, **kwargs):
kwargs.setdefault('cwd', self.svn_root)
return scm.SVN.Capture(cmd, **kwargs)
def testCheckout(self):
+ if not self.enabled:
+ return
# Checkout and verify the tree.
self.assertTree(self.tree, self.svn_root)
def testRevert(self):
+ if not self.enabled:
+ return
# Mess around and make sure revert works for all corner cases.
# - svn add a file
# - svn add a file and delete it

Powered by Google App Engine
This is Rietveld 408576698