Revert 18198 because the root chromium codereview.settings has wrong try serv...

tests/trychange_unittest.py

Index: tests/trychange_unittest.py
===================================================================
--- tests/trychange_unittest.py	(revision 18230)
+++ tests/trychange_unittest.py	(working copy)
@@ -5,6 +5,7 @@
 
 """Unit tests for trychange.py."""
 
+import os
 import unittest
 
 # Local imports
@@ -22,19 +23,18 @@
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
-      'EscapeDot', 'GIT', 'GetSourceRoot',
-      'GetTryServerSettings', 'GuessVCS',
+      'EscapeDot', 'ExecuteTryServerScript', 'GIT', 'GetSourceRoot', 'GuessVCS',
       'HELP_STRING', 'InvalidScript', 'NoTryServerAccess', 'PathDifference',
-      'RunCommand', 'SCM', 'SVN', 'TryChange', 'USAGE',
+      'RunCommand', 'SCM', 'SCRIPT_PATH', 'SVN', 'TryChange', 'USAGE',
       'datetime', 'gcl', 'gclient', 'getpass', 'logging', 'optparse', 'os',
-      'shutil', 'socket', 'sys', 'tempfile', 'traceback', 'upload', 'urllib',
+      'shutil', 'sys', 'tempfile', 'traceback', 'urllib',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange, members)
 
 
 class SVNUnittest(TryChangeTestsBase):
-  """trychange.SVN tests."""
+  """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'GenerateDiff', 'ProcessOptions', 'options'
@@ -43,8 +43,8 @@
     self.compareMembers(trychange.SVN(None), members)
 
 
-class GITUnittest(TryChangeTestsBase):
-  """trychange.GIT tests."""
+class TryChangeUnittest(TryChangeTestsBase):
+  """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'GenerateDiff', 'GetEmail', 'GetPatchName', 'ProcessOptions', 'options'