fix

methane · methane · commit ae4aae943530 · 2018-03-10T22:52:18.000+09:00
diff --git a/pymysql/tests/base.py b/pymysql/tests/base.py
@@ -55,13 +55,17 @@ def connect(self, **params):
         p = self.databases[0].copy()
         p.update(params)
         conn = pymysql.connect(**p)
-        self.addCleanup(conn.close)
+        @self.addCleanup
+        def teardown():
+            if conn.open:
+                conn.close()
         return conn
 
     def _teardown_connections(self):
         if self._connections:
             for connection in self._connections:
-                connection.close()
+                if connection.open:
+                    connection.close()
             self._connections = None
 
     def safe_create_table(self, connection, tablename, ddl, cleanup=True):
diff --git a/pymysql/tests/test_connection.py b/pymysql/tests/test_connection.py
@@ -465,25 +465,25 @@ def test_set_charset(self):
 
     def test_defer_connect(self):
         import socket
-        for db in self.databases:
-            d = db.copy()
+
+        d = self.databases[0].copy()
+        try:
+            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock.connect(d['unix_socket'])
+        except KeyError:
+            sock = socket.create_connection(
+                            (d.get('host', 'localhost'), d.get('port', 3306)))
+        for k in ['unix_socket', 'host', 'port']:
             try:
-                sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                sock.connect(d['unix_socket'])
+                del d[k]
             except KeyError:
-                sock = socket.create_connection(
-                                (d.get('host', 'localhost'), d.get('port', 3306)))
-            for k in ['unix_socket', 'host', 'port']:
-                try:
-                    del d[k]
-                except KeyError:
-                    pass
-
-            c = self.connect(defer_connect=True, **d)
-            self.assertFalse(c.open)
-            c.connect(sock)
-            c.close()
-            sock.close()
+                pass
+
+        c = pymysql.connect(defer_connect=True, **d)
+        self.assertFalse(c.open)
+        c.connect(sock)
+        c.close()
+        sock.close()
 
     @unittest2.skipUnless(sys.version_info[0:2] >= (3,2), "required py-3.2")
     def test_no_delay_warning(self):
