gclient: Use the correct bot hostnames to enable experimental deletion behavior
BUG=skia:1638
Review URL: https://codereview.chromium.org/132313017
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250524 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient.py b/gclient.py
index f68b01e..ce1fcbd 100755
--- a/gclient.py
+++ b/gclient.py
@@ -680,9 +680,8 @@
# doesn't cause the bots to break.
if not os.environ.get('CHROME_HEADLESS'):
return False
- hostname = socket.gethostname()
- logging.warning('Hostname of this machine: %s' % hostname)
- return hostname in ('vm859-m1', 'build1-m1', 'vm630-m1')
+ return socket.gethostname() in ('vm859-m1', 'BUILD1-M1',
+ 'vm630-m1.golo.chromium.org')
# When updating, determine whether the destination directory contains a
# checkout of the desired repository. If not, avoid conflicts by
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index 30a935c..7979f0e 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -1396,7 +1396,8 @@
# 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')):
+ socket.gethostname() in ('vm859-m1', 'BUILD1-M1',
+ 'vm630-m1.golo.chromium.org')):
def testDeleteConflictingCheckout(self):
if not self.enabled:
return
