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

siso: do not restart the collector if projects don't match.

Browse Source 
The correct project is set at runtime by siso.

Bug: b/455433899
Change-Id: Ibe1d348729e53425f27812e83a5c7f466a6a6964
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7234199
Commit-Queue: Alex Ovsienko <ovsienko@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
This commit is contained in:
Alex Ovsienko
2025-12-07 20:39:43 -08:00
committed by LUCI CQ
parent f8cc59a94b
commit ac1b095b09
2 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/siso_test.py
View File

@@ -815,7 +815,7 @@ ninja --failure_verbose=false -k=0
@mock.patch('siso.platform.system', return_value='Linux')
@mock.patch('siso.json.loads')
def test_start_collector_wrong_project_then_healthy(self, mock_json_loads,
def test_start_collector_wrong_project_no_restart(self, mock_json_loads,
_mock_system):
m = self._start_collector_mocks()
siso_path = "siso_path"
@@ -824,7 +824,6 @@ ninja --failure_verbose=false -k=0
status_responses=[(200, None),
(200, None)],
config_responses=[(200, None),
(200, None),
(200, None)])
status_healthy = {'healthy': True, 'status': 'StatusOK'}
@@ -844,37 +843,15 @@ ninja --failure_verbose=false -k=0
}
}
}
config_project_full = {
'exporters': {
'googlecloud': {
'project': project
}
},
'receivers': {
'otlp': {
'protocols': {
'grpc': {
'endpoint': siso._OTLP_DEFAULT_TCP_ENDPOINT
}
}
}
}
}
mock_json_loads.side_effect = [
status_healthy, config_wrong_project_full, status_healthy,
config_project_full, config_project_full
status_healthy, config_wrong_project_full
]
result = siso._start_collector(siso_path, None, project)
self.assertTrue(result)
m.subprocess_popen.assert_called_once_with(
[siso_path, "collector", "--project", project],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
start_new_session=True,
creationflags=0)
m.kill_collector.assert_called_once()
m.subprocess_popen.assert_not_called()
m.kill_collector.assert_not_called()
@mock.patch('siso.json.loads')
def test_start_collector_already_healthy(self, mock_json_loads):