From ffcc161fd0fb2fb574954c608aaa1e94187a19c5 Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Feb 2012 16:06:30 +0000
Subject: [PATCH] Remove flaky git tests.

The mere fact that they were each looking at two different outputs was already a
bad sign. Then, occasionally, the output would still not match exactly. This
needs to be recoded so remove these tests in the meantime.

TBR=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/9474003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123743 0039d316-1c4b-4281-b951-d872f2087c98
---
 tests/gclient_scm_test.py | 85 ---------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index d5818b2d90..94ab4203ac 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -916,48 +916,6 @@ class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
          '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') %
             join(self.root_dir, '.'))
 
-  def testUpdateCheckout(self):
-    if not self.enabled:
-      return
-    options = self.Options(verbose=True)
-    root_dir = gclient_scm.os.path.realpath(tempfile.mkdtemp())
-    relpath = 'foo'
-    base_path = join(root_dir, relpath)
-    url = join(self.base_path, '.git')
-    try:
-      scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
-                                  relpath=relpath)
-      file_list = []
-      scm.update(options, (), file_list)
-      self.assertEquals(len(file_list), 2)
-      self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
-      self.assertEquals(scm.revinfo(options, (), None),
-                        '069c602044c5388d2d15c3f875b057c852003458')
-    finally:
-      rmtree(root_dir)
-    msg1 = (
-        "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone --progress -b master --verbose %s %s' "
-        "in '%s'\n"
-        "Initialized empty Git repository in %s\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/')
-    msg2 = (
-        "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone --progress -b master --verbose %s %s'"
-        " in '%s'\n"
-        "Cloning into '%s'...\ndone.\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo'))
-    out = sys.stdout.getvalue()
-    sys.stdout.close()
-    sys.stdout = self._old_stdout
-    self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
-
   def testUpdateUpdate(self):
     if not self.enabled:
       return
@@ -1230,49 +1188,6 @@ class ManagedGitWrapperTestCaseMox(BaseTestCase):
 
 
 class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
-  def testUpdateCheckout(self):
-    if not self.enabled:
-      return
-    options = self.Options(verbose=True)
-    root_dir = gclient_scm.os.path.realpath(tempfile.mkdtemp())
-    relpath = 'foo'
-    base_path = join(root_dir, relpath)
-    url = join(self.base_path, '.git')
-    try:
-      scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
-                                  relpath=relpath)
-      file_list = []
-      options.revision = 'unmanaged'
-      scm.update(options, (), file_list)
-      self.assertEquals(len(file_list), 2)
-      self.assert_(gclient_scm.os.path.isfile(join(base_path, 'a')))
-      self.assertEquals(scm.revinfo(options, (), None),
-                        '069c602044c5388d2d15c3f875b057c852003458')
-    finally:
-      rmtree(root_dir)
-    msg1 = (
-        "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone --progress -b master --verbose %s %s'"
-        " in '%s'\n"
-        "Initialized empty Git repository in %s\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo', '.git') + '/')
-    msg2 = (
-        "\n_____ foo at refs/heads/master\n\n"
-        "________ running 'git clone --progress -b master --verbose %s %s'"
-        " in '%s'\n"
-        "Cloning into '%s'...\ndone.\n") % (
-          join(self.root_dir, '.', '.git'),
-          join(root_dir, 'foo'),
-          root_dir,
-          join(gclient_scm.os.path.realpath(root_dir), 'foo'))
-    out = sys.stdout.getvalue()
-    sys.stdout.close()
-    sys.stdout = self._old_stdout
-    self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
-
   def testUpdateUpdate(self):
     if not self.enabled:
       return