Remove stale revert.py unit test and fix another test I broke in r37487.

TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37618 0039d316-1c4b-4281-b951-d872f2087c98

PRESUBMIT.py

@@ -15,7 +15,6 @@ UNIT_TESTS = [
   'tests.gclient_scm_test',
   'tests.gclient_utils_test',
   'tests.presubmit_unittest',
-  'tests.revert_unittest',
   'tests.scm_unittest',
   'tests.trychange_unittest',
   'tests.watchlists_unittest',

tests/presubmit_unittest.py

@@ -734,13 +734,13 @@ class InputApiUnittest(PresubmitTestsBase):
         ],
         [
           # Expected.
-          'b.c/.git',
         ],
       ),
     ]
     input_api = presubmit.InputApi(None, './PRESUBMIT.py', False)
     self.mox.ReplayAll()
 
+    self.assertEqual(len(input_api.DEFAULT_WHITE_LIST), 20)
     self.assertEqual(len(input_api.DEFAULT_BLACK_LIST), 9)
     for item in files:
       results = filter(input_api.FilterSourceFile, item[0])
@@ -748,7 +748,8 @@ class InputApiUnittest(PresubmitTestsBase):
         self.assertEquals(results[i].LocalPath(),
                           presubmit.normpath(item[1][i]))
       # Same number of expected results.
-      self.assertEquals(len(results), len(item[1]))
+      self.assertEquals(sorted([f.LocalPath() for f in results]),
+                        sorted(item[1]))
 
   def testCustomFilter(self):
     def FilterSourceFile(affected_file):

tests/revert_unittest.py

@@ -1,112 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Unit tests for revert.py."""
-
-import revert
-from super_mox import mox, SuperMoxTestBase
-
-
-class RevertTestsBase(SuperMoxTestBase):
-  """Setups and tear downs the mocks but doesn't test anything as-is."""
-  def setUp(self):
-    SuperMoxTestBase.setUp(self)
-    self.mox.StubOutWithMock(revert, 'gcl')
-    self.mox.StubOutWithMock(revert, 'gclient')
-    self.mox.StubOutWithMock(revert, 'gclient_scm')
-
-    # These functions are not tested.
-    self.mox.StubOutWithMock(revert, 'GetRepoBase')
-    self.mox.StubOutWithMock(revert, 'CaptureSVNLog')
-
-
-class RevertUnittest(RevertTestsBase):
-  """General revert.py tests."""
-  def testMembersChanged(self):
-    members = [
-      'CaptureSVNLog', 'GetRepoBase', 'Main', 'ModifiedFile', 'NoBlameList',
-      'NoModifiedFile', 'OutsideOfCheckout', 'Revert', 'UniqueFast',
-      'exceptions', 'gcl', 'gclient', 'gclient_scm', 'gclient_utils',
-      'optparse', 'os', 'sys', 'xml'
-    ]
-    # If this test fails, you should add the relevant test.
-    self.compareMembers(revert, members)
-
-
-class RevertMainUnittest(RevertTestsBase):
-  def setUp(self):
-    RevertTestsBase.setUp(self)
-    self.mox.StubOutWithMock(revert, 'gcl')
-    self.mox.StubOutWithMock(revert, 'Revert')
-    self.fake_root = '/revert/RevertMainUnittest/ShouldntExist'
-
-  def testMain(self):
-    # OptParser calls revert.os.path.exists and is a pain when mocked.
-    self.UnMock(revert.os.path, 'exists')
-    revert.gcl.GetInfoDir().AndReturn(self.fake_root)
-    #revert.os.path.exists(self.fake_root).AndReturn(True)
-    revert.os.mkdir(self.fake_root)
-    revert.gcl.GetInfoDir().AndReturn(self.fake_root)
-    revert.Revert([42, 23], True, True, False, 'bleh', ['foo@example.com']
-        ).AndReturn(31337)
-    self.mox.ReplayAll()
-
-    self.assertEquals(revert.Main(['revert', '-c', '-f', '-n', '-m', 'bleh',
-                                   '-r', 'foo@example.com', '42', '23']),
-                      31337)
-
-
-class RevertRevertUnittest(RevertTestsBase):
-  def setUp(self):
-    RevertTestsBase.setUp(self)
-    self.mox.StubOutWithMock(revert.gclient_scm.scm.SVN, 'CaptureStatus')
-
-  def testRevert(self):
-    revert.gcl.GetRepositoryRoot().AndReturn('foo')
-    revert.os.chdir('foo')
-    entries = [{
-      'author': 'Georges',
-      'paths': [
-          {'path': 'proto://fqdn/repo/random_file'}
-      ],
-    }]
-    revert.CaptureSVNLog(['-r', '42', '-v']).AndReturn(entries)
-    revert.GetRepoBase().AndReturn('proto://fqdn/repo/')
-    revert.gclient_scm.scm.SVN.CaptureStatus(['random_file']).AndReturn([])
-    revert.gcl.RunShell(['svn', 'up', 'random_file'])
-    revert.os.path.isdir('random_file').AndReturn(False)
-    status = """--- Reverse-merging r42 into '.':
-M    random_file
-"""
-    revert.gcl.RunShellWithReturnCode(['svn', 'merge', '-c', '-42',
-                                       'random_file'],
-                                      print_output=True).AndReturn([status, 0])
-    change = self.mox.CreateMockAnything()
-    revert.gcl.ChangeInfo('revert42', 0, 0, 'Reverting 42.\n\nbleh',
-                          [('M      ', 'random_file')], 'foo').AndReturn(change)
-    change.Save()
-    revert.gcl.UploadCL(change,
-                        ['--no_presubmit', '-r', 'foo@example.com', '--no_try'])
-    revert.gcl.Commit(change, ['--no_presubmit', '--force'])
-    revert.gclient.Main(['gclient.py', 'sync'])
-    outputs = [
-      'Blaming Georges\n',
-      'Emailing foo@example.com\n',
-      'These files were modified in 42:',
-      'random_file',
-      '',
-      'Reverting 42 in ./'
-    ]
-    for line in outputs:
-      revert.sys.stdout.write(line)
-      revert.sys.stdout.write('\n')
-    self.mox.ReplayAll()
-
-    revert.Revert([42], True, True, False, 'bleh', ['foo@example.com'])
-
-
-if __name__ == '__main__':
-  import unittest
-  unittest.main()