connect_timeout fix (#360)

* fix the python 3.7 compatibility * Fixes #257
aio-libs · Dec 4, 2018 · 2eb8533 · 2eb8533
1 parent f712904
commit 2eb8533
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/aiomysql/connection.py b/aiomysql/connection.py
@@ -475,14 +475,21 @@ async def _connect(self):
         try:
             if self._unix_socket and self._host in ('localhost', '127.0.0.1'):
                 self._reader, self._writer = await \
-                    asyncio.open_unix_connection(self._unix_socket,
-                                                 loop=self._loop)
+                    asyncio.wait_for(
+                        asyncio.open_unix_connection(
+                            self._unix_socket,
+                            loop=self._loop),
+                        timeout=self.connect_timeout)
                 self.host_info = "Localhost via UNIX socket: " + \
                                  self._unix_socket
             else:
                 self._reader, self._writer = await \
-                    asyncio.open_connection(self._host, self._port,
-                                            loop=self._loop)
+                    asyncio.wait_for(
+                        asyncio.open_connection(
+                            self._host,
+                            self._port,
+                            loop=self._loop),
+                        timeout=self.connect_timeout)
                 self._set_keep_alive()
                 self.host_info = "socket %s:%d" % (self._host, self._port)
 

diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -22,6 +22,12 @@ def fill_my_cnf(self):
         with open(path2, 'w') as f2:
             f2.write(tmpl.format_map(self.__dict__))
 
+    @run_until_complete
+    def test_connect_timeout(self):
+        # All exceptions are caught and raised as operational errors
+        with self.assertRaises(aiomysql.OperationalError):
+            yield from self.connect(connect_timeout=0.000000000001)
+
     @run_until_complete
     def test_config_file(self):
         self.fill_my_cnf()