Skip to content

Commit b460c85

Browse files
committed
BUG21414628: Fix failing C extension unittests
We fix unittests failing with C extension with this patch.
1 parent 33c200e commit b460c85

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

lib/mysql/connector/connection_cext.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def close(self):
187187
def is_connected(self):
188188
"""Reports whether the connection to MySQL Server is available"""
189189
if self._cmysql:
190-
return self._cmysql.connected()
190+
return self._cmysql.ping()
191191

192192
return False
193193

@@ -208,12 +208,17 @@ def ping(self, reconnect=False, attempts=1, delay=0):
208208
errmsg = "Connection to MySQL is not available"
209209

210210
try:
211-
self._cmysql.ping()
211+
connected = self._cmysql.ping()
212212
except AttributeError:
213-
if reconnect:
214-
self.reconnect(attempts=attempts, delay=delay)
215-
else:
216-
raise errors.InterfaceError(errmsg)
213+
pass # Raise or reconnect later
214+
else:
215+
if connected:
216+
return
217+
218+
if reconnect:
219+
self.reconnect(attempts=attempts, delay=delay)
220+
else:
221+
raise errors.InterfaceError(errmsg)
217222

218223
def set_character_set_name(self, charset):
219224
"""Sets the default character set name for current connection.

0 commit comments

Comments
 (0)