adjust post-merge

Author: uruwhy

tests/objects/test_agent.py

@@ -210,14 +210,6 @@ async def test_get_preferred_executor_empty(self, ability, executor):
         test_ability = ability(ability_id='123', executors=[test_executor])
         assert await agent.get_preferred_executor(test_ability) is None
 
-    async def test_kill(self):
-        agent = Agent(paw='123', sleep_min=5, group='red', sleep_max=5, watchdog=0, executors=['cmd'],
-                      platform='windows', trusted=True)
-        await agent.kill()
-        assert agent.watchdog == 1
-        assert agent.sleep_min == 120
-        assert agent.sleep_max == 120
-
     async def test_bootstrap(self, ability, executor, data_svc):
         # Set empty executor list to exit agent.task function immmediately without mocking
         agent = Agent(paw='123', sleep_min=5, group='red', sleep_max=5, watchdog=0, executors=[],

tests/services/test_data_svc.py

@@ -495,6 +495,7 @@ def _mock_iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False, includ
             mock_load_yaml_file.assert_any_call(Planner, 'mockplannerforplugin.yml', data_svc.Access.RED)
             mock_load_yaml_file.assert_any_call(Source, 'mocksourceforplugin.yml', data_svc.Access.RED)
             mock_add_special_payload.assert_called_once_with('mockextension', 'mockextval')
+
     @mock.patch.object(logging.Logger, 'warn')
     @mock.patch.object(BaseWorld, 'strip_yml', wraps=strip_ability_yaml)
     async def test_load_ability_file(self, mock_strip_yml, mock_warn, data_svc):

tests/web_server/test_core_endpoints.py

@@ -129,9 +129,7 @@ async def test_command_overwrite_failure(aiohttp_client, authorized_cookies):
                                                                       type='python_module',
                                                                       version='3.11.0'))))
 
-    assert resp.status == HTTPStatus.OK
-    config_dict = await resp.json()
-    assert config_dict.get('requirements', dict()).get('go', dict()).get('command') == 'go version'
+    assert resp.status == HTTPStatus.BAD_REQUEST
 
 
 async def test_upload_file(aiohttp_client):