From 7676cca756766dec5798ee6201014c47807bbb80 Mon Sep 17 00:00:00 2001 From: "sergiyb@google.com" Date: Mon, 27 Apr 2015 14:40:14 +0000 Subject: [PATCH] Disabled flaky depot_tools tests R=akuegel@chromium.org,pgervais@chromium.org BUG=477454 Review URL: https://codereview.chromium.org/1099143002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295007 0039d316-1c4b-4281-b951-d872f2087c98 --- tests/checkout_test.py | 1 + tests/gclient_smoketest.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tests/checkout_test.py b/tests/checkout_test.py index 97249065e..dfc88b06a 100755 --- a/tests/checkout_test.py +++ b/tests/checkout_test.py @@ -454,6 +454,7 @@ class GitCheckout(GitBaseTest): root = os.path.join(self.root_dir, self.name) self._check_base(self._get_co(None), root, None) + @unittest.skip('flaky') def testException(self): self._check_exception( self._get_co(None), diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py index 388d2a83a..6a8e3aaeb 100755 --- a/tests/gclient_smoketest.py +++ b/tests/gclient_smoketest.py @@ -1582,6 +1582,7 @@ class BlinkDEPSTransitionSmokeTest(GClientSmokeBase): # But not the .git folder self.assertFalse(os.path.exists(join(self.blink, '.git'))) + @unittest.skip('flaky') def testBlinkDEPSChangeUsingGclient(self): """Checks that {src,blink} repos are consistent when syncing going back and forth using gclient sync src@revision.""" @@ -1607,6 +1608,7 @@ class BlinkDEPSTransitionSmokeTest(GClientSmokeBase): self.CheckStatusPostMergePoint() + @unittest.skip('flaky') def testBlinkDEPSChangeUsingGit(self): """Like testBlinkDEPSChangeUsingGclient, but move the main project using directly git and not gclient sync.""" @@ -1639,6 +1641,7 @@ class BlinkDEPSTransitionSmokeTest(GClientSmokeBase): self.CheckStatusPostMergePoint() + @unittest.skip('flaky') def testBlinkLocalBranchesArePreserved(self): """Checks that the state of local git branches are effectively preserved when going back and forth."""