| Index: trunk/tools/depot_tools/tests/gclient_smoketest.py
 | 
| ===================================================================
 | 
| --- trunk/tools/depot_tools/tests/gclient_smoketest.py	(revision 250873)
 | 
| +++ trunk/tools/depot_tools/tests/gclient_smoketest.py	(working copy)
 | 
| @@ -1396,8 +1396,7 @@
 | 
|    # 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
 | 
| 
 |