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: remove redundant test and consolidate dead then healthy tests.

Browse Source 
Bug: b/459690822
Change-Id: I7e3a342d3e5be7b5802275cdce0db2ec6a6a6964
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7244732
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Philipp Wollermann <philwo@google.com>
Commit-Queue: Alex Ovsienko <ovsienko@google.com>
This commit is contained in:
Alex Ovsienko
2025-12-09 22:48:30 -08:00
committed by LUCI CQ
parent a6671ce6c7
commit ecbf89e1da
1 changed files with 43 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
tests/siso_test.py
View File

@@ -930,49 +930,57 @@ ninja --failure_verbose=false -k=0
self.assertFalse(result) self.assertFalse(result)
m.is_subcommand_present.assert_called_once_with(siso_path, 'collector') m.is_subcommand_present.assert_called_once_with(siso_path, 'collector')
@mock.patch('sys.platform', new='linux')
@mock.patch('siso.json.loads') @mock.patch('siso.json.loads')
def test_start_collector_dead_then_healthy(self, mock_json_loads): def test_start_collector_dead_then_healthy(self, mock_json_loads):
m = self._start_collector_mocks() test_cases = {
siso_path = "siso_path" 'linux': {
project = "test-project" 'platform': 'linux',
'creationflags': 0,
self._configure_http_responses(m.mock_conn,
status_responses=[(404, None),
(200, None)],
config_responses=[(200, None),
(200, None)])
status_healthy = {'healthy': True, 'status': 'StatusOK'}
config_project_full = {
'exporters': {
'googlecloud': {
'project': project
}
}, },
'receivers': { 'windows': {
'otlp': { 'platform': 'win32',
'protocols': { 'creationflags': 512, # subprocess.CREATE_NEW_PROCESS_GROUP
'grpc': { }
'endpoint': siso._OTLP_DEFAULT_TCP_ENDPOINT }
for name, tc in test_cases.items():
with self.subTest(name), \
mock.patch('sys.platform', new=tc['platform']), \
mock.patch('subprocess.CREATE_NEW_PROCESS_GROUP',
tc['creationflags'], create=True):
m = self._start_collector_mocks()
siso_path = "siso_path"
project = "test-project"
self._configure_http_responses(m.mock_conn,
status_responses=[(404, None),
(200, None)],
config_responses=[(200, None)])
status_healthy = {'healthy': True, 'status': 'StatusOK'}
config = {
'receivers': {
'otlp': {
'protocols': {
'grpc': {
'endpoint': siso._OTLP_DEFAULT_TCP_ENDPOINT
}
}
} }
} }
} }
} mock_json_loads.side_effect = [status_healthy, config]
}
mock_json_loads.side_effect = [
status_healthy, config_project_full, config_project_full
]
result = siso._start_collector(siso_path, None, project) result = siso._start_collector(siso_path, None, project)
self.assertTrue(result) self.assertTrue(result)
m.subprocess_popen.assert_called_once_with( m.subprocess_popen.assert_called_once_with(
[siso_path, "collector", "--project", project], [siso_path, "collector", "--project", project],
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
start_new_session=True, start_new_session=True,
creationflags=0) creationflags=tc['creationflags'])
m.kill_collector.assert_not_called() m.kill_collector.assert_not_called()
mock_json_loads.reset_mock()
@mock.patch('sys.platform', new='linux') @mock.patch('sys.platform', new='linux')
@mock.patch('siso.json.loads') @mock.patch('siso.json.loads')
@@ -1020,92 +1028,7 @@ ninja --failure_verbose=false -k=0
creationflags=0) creationflags=0)
m.kill_collector.assert_called_once() m.kill_collector.assert_called_once()
@mock.patch('sys.platform', new='win32')
@mock.patch('siso.json.loads')
def test_start_collector_dead_then_healthy_windows(self, mock_json_loads):
m = self._start_collector_mocks()
siso_path = "siso_path"
project = "test-project"
self._configure_http_responses(m.mock_conn,
status_responses=[(404, None),
(200, None)],
config_responses=[(200, None),
(200, None)])
status_healthy = {'healthy': True, 'status': 'StatusOK'}
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_project_full, config_project_full
]
# On non-Windows platforms, subprocess.CREATE_NEW_PROCESS_GROUP does not exist.
# We mock it here to make the test runnable on all platforms.
with mock.patch('subprocess.CREATE_NEW_PROCESS_GROUP', 512,
create=True):
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=subprocess.CREATE_NEW_PROCESS_GROUP)
m.kill_collector.assert_not_called()
@mock.patch('sys.platform', new='linux')
@mock.patch('siso.json.loads')
def test_start_collector_wrong_project_no_restart(self, mock_json_loads):
m = self._start_collector_mocks()
siso_path = "siso_path"
project = "test-project"
self._configure_http_responses(m.mock_conn,
status_responses=[(200, None),
(200, None)],
config_responses=[(200, None),
(200, None)])
status_healthy = {'healthy': True, 'status': 'StatusOK'}
config_wrong_project_full = {
'exporters': {
'googlecloud': {
'project': 'wrong-project'
}
},
'receivers': {
'otlp': {
'protocols': {
'grpc': {
'endpoint': siso._OTLP_DEFAULT_TCP_ENDPOINT
}
}
}
}
}
mock_json_loads.side_effect = [
status_healthy, config_wrong_project_full
]
result = siso._start_collector(siso_path, None, project)
self.assertTrue(result)
m.subprocess_popen.assert_not_called()
m.kill_collector.assert_not_called()
@mock.patch('siso.json.loads') @mock.patch('siso.json.loads')
def test_start_collector_already_healthy(self, mock_json_loads): def test_start_collector_already_healthy(self, mock_json_loads):