Revert 250524 "gclient: Use the correct bot hostnames to enable ..."

trunk/tools/depot_tools/tests/gclient_smoketest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 1378 matching lines @@
         ('svn', 'trunk/third_party/foo@1', 'src/third_party/foo'),
       ]
     expected = [(scm, bases[scm] + url, os.path.join(self.root_dir, path))
                 for (scm, url, path) in expected_source]
 
     self.assertEquals(sorted(entries), sorted(expected))
 
   # TODO(borenet): Enable this at the same time that the guard is removed in
   # gclient.
   if (os.environ.get('CHROME_HEADLESS') and
-      socket.gethostname() in ('vm859-m1', 'BUILD1-M1',
-                               'vm630-m1.golo.chromium.org')):
+      socket.gethostname() in ('vm859-m1', 'build1-m1', 'vm630-m1')):
     def testDeleteConflictingCheckout(self):
       if not self.enabled:
         return
   
       # Create an initial svn checkout.
       self.gclient(['config', '--spec',
           'solutions=['
           '{"name": "src",'
           ' "url": "' + self.svn_base + 'trunk/src"},'
           ']'
@@ skipping 159 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()