fix problem due to solve conflicts

examples/android_assistant/run_assistant.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # @Desc   : the entry of android assistant including learning and acting stage
+#           See the usage README inside `metagpt/ext/android_assistant`
 
 import asyncio
 from pathlib import Path

tests/metagpt/environment/android_env/test_android_ext_env.py

@@ -16,8 +16,8 @@ def mock_device_shape_invalid(self, adb_cmd: str) -> str:
     return ADB_EXEC_FAIL
 
 
-def mock_list_devices(self, adb_cmd: str) -> str:
-    return "devices\nemulator-5554"
+def mock_list_devices(self) -> str:
+    return ["emulator-5554"]
 
 
 def mock_get_screenshot(self, adb_cmd: str) -> str:
@@ -35,6 +35,7 @@ def mock_write_read_operation(self, adb_cmd: str) -> str:
 def test_android_ext_env(mocker):
     device_id = "emulator-5554"
     mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_device_shape)
+    mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.list_devices", mock_list_devices)
 
     ext_env = AndroidExtEnv(device_id=device_id, screenshot_dir="/data2/", xml_dir="/data2/")
     assert ext_env.adb_prefix == f"adb -s {device_id} "
@@ -48,7 +49,6 @@ def test_android_ext_env(mocker):
     )
     assert ext_env.device_shape == (0, 0)
 
-    mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_list_devices)
     assert ext_env.list_devices() == [device_id]
 
     mocker.patch("metagpt.environment.android.android_ext_env.AndroidExtEnv.execute_adb_with_cmd", mock_get_screenshot)

tests/metagpt/environment/mincraft_env/__init__.py

@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Desc   :

tests/metagpt/environment/mincraft_env/test_mincraft_ext_env.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Desc   : the unittest of MincraftExtEnv
-
-
-from metagpt.const import MC_CKPT_DIR
-from metagpt.environment.mincraft_env.mincraft_ext_env import MincraftExtEnv
-
-
-def test_mincraft_ext_env():
-    ext_env = MincraftExtEnv()
-
-    assert ext_env.server, f"{ext_env.server_host}:{ext_env.server_port}"
-    assert MC_CKPT_DIR.joinpath("skill/code").exists()
-    assert ext_env.warm_up.get("optional_inventory_items") == 7

tests/metagpt/environment/stanford_town_env/test_stanford_town_ext_env.py

@@ -33,7 +33,6 @@ def test_stanford_town_ext_env():
     assert len(ext_env.get_nearby_tiles(tile=tile, vision_r=5)) == 121
 
     event = ("double studio:double studio:bedroom 2:bed", None, None, None)
-    ext_env.add_tiles_event(tile[1], tile[0], event=event)
     ext_env.add_event_from_tile(event, tile)
     assert len(ext_env.tiles[tile[1]][tile[0]]["events"]) == 1
 

tests/metagpt/environment/test_base_env.py

@@ -64,7 +64,7 @@ async def test_ext_env():
     _ = await env.write_thru_api(EnvAPIAbstract(api_name="write_api", kwargs={"a": 5, "b": 10}))
     assert env.value == 15
 
-    with pytest.raises(ValueError):
+    with pytest.raises(KeyError):
         await env.read_from_api("not_exist_api")
 
     assert await env.read_from_api("read_api_no_param") == 15