InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ninjalog_uploader.py

Browse Source 
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 <tikuta@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
This commit is contained in:
Takuto Ikuta
2022-01-21 00:04:23 +00:00
committed by LUCI CQ
parent ac54b8de82
commit 3dc0172a6b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ninjalog_uploader.py
View File

@@ -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 <user>@google.com' for googler using goma.
return l.startswith('Login as ') and l.endswith('@google.com')

6
tests/ninjalog_uploader_test.py
View File

@@ -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: