fix: 修复单元测试用例

Author: liaoyanglay

.gitignore

@@ -144,4 +144,7 @@ botpy.log.*
 temp/
 
 # idea config
-.idea
+.idea
+
+# vscode config
+.vscode

README.md

@@ -180,4 +180,4 @@ pytest
 
 欢迎扫码加入**QQ 频道开发者社区**。
 
-![开发者社区](https://mpqq.gtimg.cn/privacy/qq_guild_developer.png)
+![开发者社区](https://guild-1251316161.cos.ap-guangzhou.myqcloud.com/miniapp/icons/qq_guild_developer_doc.png)

botpy/http.py

@@ -36,21 +36,21 @@ def _gen_form_data(self) -> multipart.MultipartWriter:
                     )
                 else:
                     part = payload.get_payload(
-                        value, 
+                        value,
                         headers=headers,
-                        encoding=self._charset
+                        encoding=self._charset,
                     )
             except Exception as exc:
                 print(value)
                 raise TypeError(
-                   "Can not serialize value type: %r\n " "headers: %r\n value: %r" % (type(value), headers, value)
+                    "Can not serialize value type: %r\n " "headers: %r\n value: %r" % (type(value), headers, value)
                 ) from exc
 
             if dispparams:
                 part.set_content_disposition(
-                    "form-data", 
+                    "form-data",
                     quote_fields=self._quote_fields,
-                    **dispparams
+                    **dispparams,
                 )
                 assert part.headers is not None
                 part.headers.popall(hdrs.CONTENT_LENGTH, None)
@@ -127,7 +127,7 @@ def __init__(
         self.timeout = timeout
         self.is_sandbox = is_sandbox
 
-        self._token: Optional[Token] = None
+        self._token: Optional[Token] = None if not app_id else Token(app_id=app_id, secret=secret)
         self._session: Optional[aiohttp.ClientSession] = None
         self._global_over: Optional[asyncio.Event] = None
         self._headers: Optional[dict] = None
@@ -150,7 +150,7 @@ async def check_session(self):
 
         if not self._session or self._session.closed:
             self._session = aiohttp.ClientSession(
-                connector=TCPConnector(limit=500, ssl=SSLContext(), force_close=True)
+                connector=TCPConnector(limit=500, ssl=SSLContext(), force_close=True),
             )
 
     async def request(self, route: Route, retry_time: int = 0, **kwargs: Any):
@@ -204,4 +204,4 @@ async def login(self, token: Token) -> robot.Robot:
 
         data = await self.request(Route("GET", "/users/@me"))
         # TODO 检查机器人token错误的raise exception @veehou
-        return data
+        return data

botpy/robot.py

@@ -59,6 +59,9 @@ async def update_access_token(self):
             raise
         finally:
             await session.close()
+        if "access_token" not in data or "expires_in" not in data:
+            _log.error("[botpy] 获取token失败，请检查appid和secret填写是否正确！")
+            raise RuntimeError(str(data))
         _log.info("[botpy] access_token expires_in " + data["expires_in"])
         self.access_token = data["access_token"]
         self.expires_in = int(data["expires_in"]) + int(time.time())

tests/.test(demo).yaml

@@ -2,6 +2,7 @@
 token:
   appid: "123"
   token: "xxxx"
+  secret: "xxx"
 test_params:
   guild_id: "123"
   guild_owner_id: "123"
@@ -10,7 +11,6 @@ test_params:
   guild_test_role_id: "123"
   channel_id: "123"
   channel_name: "channel"
-  channel_parent_id: "123"
   channel_schedule_id: "123"
   robot_name: "veehou's robot"
   is_sandbox: False

tests/test_api.py

@@ -27,7 +27,6 @@
 GUILD_TEST_ROLE_ID = test_params_["guild_test_role_id"]
 CHANNEL_ID = test_params_["channel_id"]
 CHANNEL_NAME = test_params_["channel_name"]
-CHANNEL_PARENT_ID = test_params_["channel_parent_id"]
 CHANNEL_SCHEDULE_ID = test_params_["channel_schedule_id"]
 ROBOT_NAME = test_params_["robot_name"]
 IS_SANDBOX = test_params_["is_sandbox"]
@@ -38,7 +37,7 @@ class APITestCase(unittest.TestCase):
     def setUp(self) -> None:
         print("setUp")
         self.loop = asyncio.get_event_loop()
-        self.http = BotHttp(timeout=5, app_id=test_config["token"]["appid"], token=test_config["token"]["token"])
+        self.http = BotHttp(timeout=5, app_id=test_config["token"]["appid"], secret=test_config["token"]["secret"])
         self.api = botpy.BotAPI(self.http)
 
     def tearDown(self) -> None:
@@ -59,25 +58,37 @@ def test_guild_role_create_update_delete(self):
         self.assertEqual("Test Role", result["role"]["name"])
         id = result["role"]["id"]
 
+        time.sleep(0.5)
         coroutine = self.api.update_guild_role(GUILD_ID, role_id=id, name="Test Update Role")
         result = self.loop.run_until_complete(coroutine)
         self.assertEqual("Test Update Role", result["role"]["name"])
 
+        time.sleep(0.5)
         result = self.loop.run_until_complete(self.api.delete_guild_role(GUILD_ID, role_id=id))
         self.assertEqual(None, result)
 
     def test_guild_role_member_add_delete(self):
+        coroutine = self.api.create_guild_role(GUILD_ID, name="Test Role Member", color=4278245297)
+        result: guild.GuildRole = self.loop.run_until_complete(coroutine)
+        self.assertEqual("Test Role Member", result["role"]["name"])
+        id = result["role"]["id"]
+
+        time.sleep(0.5)
         result = self.loop.run_until_complete(
-            self.api.create_guild_role_member(GUILD_ID, GUILD_TEST_ROLE_ID, GUILD_TEST_MEMBER_ID)
+            self.api.create_guild_role_member(GUILD_ID, id, GUILD_TEST_MEMBER_ID),
         )
         self.assertEqual(None, result)
 
-    def test_guild_role_member_delete(self):
+        time.sleep(0.5)
         result = self.loop.run_until_complete(
-            self.api.delete_guild_role_member(GUILD_ID, GUILD_TEST_ROLE_ID, GUILD_TEST_MEMBER_ID)
+            self.api.delete_guild_role_member(GUILD_ID, id, GUILD_TEST_MEMBER_ID),
         )
         self.assertEqual(None, result)
 
+        time.sleep(0.5)
+        result = self.loop.run_until_complete(self.api.delete_guild_role(GUILD_ID, role_id=id))
+        self.assertEqual(None, result)
+
     def test_guild_member(self):
         member: user.Member = self.loop.run_until_complete(self.api.get_guild_member(GUILD_ID, GUILD_OWNER_ID))
         self.assertEqual(GUILD_OWNER_NAME, member["user"]["username"])
@@ -139,10 +150,10 @@ def test_me(self):
 
     def test_me_guilds(self):
         guilds = self.loop.run_until_complete(self.api.me_guilds())
-        self.assertEqual(1, len(guilds))
+        self.assertGreaterEqual(len(guilds), 1)
 
         guilds = self.loop.run_until_complete(self.api.me_guilds(GUILD_ID, limit=1, desc=True))
-        self.assertEqual(0, len(guilds))
+        self.assertLessEqual(len(guilds), 1)
 
     def test_post_audio(self):
         payload = {"audio_url": "test", "text": "test", "status": 0}

tests/test_flags.py

@@ -14,7 +14,7 @@ def test_multi_intents(self):
 
     def test_default(self):
         intents = botpy.Intents.default()
-        self.assertEqual(1879047679, intents.value)
+        self.assertEqual(1846285315, intents.value)
 
 
 if __name__ == "__main__":

tests/test_token.py

@@ -9,7 +9,8 @@
 class MyTestCase(unittest.TestCase):
     def test_something(self):
         token = Token("123", "123")
-        self.assertEqual(token.get_string(), "123.123")
+        self.assertEqual(token.app_id, "123")
+        self.assertEqual(token.secret, "123")
 
 
 if __name__ == "__main__":