ensure coroutine is awaited when discarding results in SSCursor, fixes …

…#635 also fix typo in associated test case
aio-libs · Jan 28, 2022 · 7817dbe · 7817dbe
1 parent 018af44
commit 7817dbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/aiomysql/connection.py b/aiomysql/connection.py
@@ -711,7 +711,7 @@ async def _execute_command(self, command, sql):
         if self._result is not None:
             if self._result.unbuffered_active:
                 warnings.warn("Previous unbuffered result was left incomplete")
-                self._result._finish_unbuffered_query()
+                await self._result._finish_unbuffered_query()
             while self._result.has_next:
                 await self.next_result()
             self._result = None

diff --git a/tests/test_sscursor.py b/tests/test_sscursor.py
@@ -190,11 +190,6 @@ async def read_cursor():
         await conn.cursor(SSCursor)
 
 
-@pytest.mark.xfail(
-    reason="https://github.com/aio-libs/aiomysql/issues/635",
-    raises=InternalError,
-    strict=True,
-)
 @pytest.mark.run_loop
 async def test_sscursor_discarded_result(connection):
     conn = connection
@@ -203,4 +198,4 @@ async def test_sscursor_discarded_result(connection):
         await cursor.execute("select 1")
         await cursor.execute("select 2")
         ret = await cursor.fetchone()
-    assert (1,) == ret
+    assert (2,) == ret