From 3dc0172a6b629edf575bf4851653ce6aa6635d8a Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Fri, 21 Jan 2022 00:04:23 +0000 Subject: [PATCH] fix ninjalog_uploader.py This is to fix https://crbug.com/1288639#c5 Bug: 1288639 Change-Id: Ife224fb5d5fe4faa4a78785828d4fa488fda3c6e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3403475 Commit-Queue: Takuto Ikuta Auto-Submit: Takuto Ikuta Reviewed-by: Fumitoshi Ukai Commit-Queue: Fumitoshi Ukai --- ninjalog_uploader.py | 5 ++++- tests/ninjalog_uploader_test.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py index 18ca64d3e5..fa19693d2c 100755 --- a/ninjalog_uploader.py +++ b/ninjalog_uploader.py @@ -45,7 +45,10 @@ def IsGoogler(): shell=True) if p.returncode != 0: return False - l = p.stdout.splitlines()[0] + lines = p.stdout.splitlines() + if len(lines) == 0: + return False + l = lines[0] # |l| will be like 'Login as @google.com' for googler using goma. return l.startswith('Login as ') and l.endswith('@google.com') diff --git a/tests/ninjalog_uploader_test.py b/tests/ninjalog_uploader_test.py index facc20dfcb..a4098e72f2 100755 --- a/tests/ninjalog_uploader_test.py +++ b/tests/ninjalog_uploader_test.py @@ -25,7 +25,11 @@ class NinjalogUploaderTest(unittest.TestCase): with unittest.mock.patch('subprocess.run') as run_mock: run_mock.return_value.returncode = 1 - run_mock.return_value.stdout = 'Not logged in\n' + self.assertFalse(ninjalog_uploader.IsGoogler()) + + with unittest.mock.patch('subprocess.run') as run_mock: + run_mock.return_value.returncode = 0 + run_mock.return_value.stdout = '' self.assertFalse(ninjalog_uploader.IsGoogler()) with unittest.mock.patch('subprocess.run') as run_mock: