From 52fdd1ffcefb16435eee27023af95e5e844cfc16 Mon Sep 17 00:00:00 2001 From: Milad Fa Date: Tue, 15 Sep 2020 21:24:46 +0000 Subject: [PATCH] Adding AIX Change-Id: Ibf023a1f6b635872c849bda885b47ea1dbf7dda3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2410733 Reviewed-by: Dirk Pranke Commit-Queue: Dirk Pranke --- gclient_utils.py | 6 ++++-- metrics.py | 2 +- tests/metrics_test.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gclient_utils.py b/gclient_utils.py index 6820a19a16..21401de60a 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -589,7 +589,7 @@ def CheckCallAndFilter(args, print_stdout=False, filter_fn=None, # If our stdout is a terminal, then pass in a psuedo-tty pipe to our # subprocess when filtering its output. This makes the subproc believe # it was launched from a terminal, which will preserve ANSI color codes. - if sys.stdout.isatty() and GetMacWinOrLinux() != 'win': + if sys.stdout.isatty() and GetMacWinAixOrLinux() != 'win': pipe_reader, pipe_writer = os.openpty() else: pipe_reader, pipe_writer = os.pipe() @@ -737,7 +737,7 @@ def FindFileUpwards(filename, path=None): path = new_path -def GetMacWinOrLinux(): +def GetMacWinAixOrLinux(): """Returns 'mac', 'win', or 'linux', matching the current platform.""" if sys.platform.startswith(('cygwin', 'win')): return 'win' @@ -745,6 +745,8 @@ def GetMacWinOrLinux(): return 'linux' elif sys.platform == 'darwin': return 'mac' + elif sys.platform.startswith('aix'): + return 'aix' raise Error('Unknown platform: ' + sys.platform) diff --git a/metrics.py b/metrics.py index 84d775e4f8..69c19e4174 100644 --- a/metrics.py +++ b/metrics.py @@ -216,7 +216,7 @@ class MetricsCollector(object): # Add metrics regarding environment information. self.add('timestamp', int(time.time())) self.add('python_version', metrics_utils.get_python_version()) - self.add('host_os', gclient_utils.GetMacWinOrLinux()) + self.add('host_os', gclient_utils.GetMacWinAixOrLinux()) self.add('host_arch', detect_host_arch.HostArch()) depot_tools_age = metrics_utils.get_repo_timestamp(DEPOT_TOOLS) diff --git a/tests/metrics_test.py b/tests/metrics_test.py index 5e2a0885a4..05915d8e21 100644 --- a/tests/metrics_test.py +++ b/tests/metrics_test.py @@ -62,8 +62,8 @@ class MetricsCollectorTest(unittest.TestCase): TimeMock()).start() mock.patch('metrics.metrics_utils.get_python_version', lambda: '2.7.13').start() - mock.patch('metrics.gclient_utils.GetMacWinOrLinux', - lambda: 'linux').start() + mock.patch( + 'metrics.gclient_utils.GetMacWinAixOrLinux', lambda: 'linux').start() mock.patch('metrics.detect_host_arch.HostArch', lambda: 'x86').start() mock.patch('metrics_utils.get_repo_timestamp',