Fix test fails

methane · methane · commit e6865ffa10a5 · 2018-03-01T03:04:12.000+09:00
diff --git a/pymysql/tests/base.py b/pymysql/tests/base.py
@@ -40,12 +40,24 @@ def mysql_server_is(self, conn, version_tuple):
         )
         return server_version_tuple >= version_tuple
 
-    def setUp(self):
-        self.connections = []
+    _connections = None
+
+    @property
+    def connections(self):
+        if self._connections is not None:
+            return self._connections
+        self._connections = []
         for params in self.databases:
             self.connections.append(pymysql.connect(**params))
         self.addCleanup(self._teardown_connections)
 
+    def connect(self, **params):
+        p = self.databases[0].copy()
+        p.update(params)
+        conn = pymysql.connect(**p)
+        self.addCleanup(conn.close)
+        return conn
+
     def _teardown_connections(self):
         for connection in self.connections:
             connection.close()
diff --git a/pymysql/tests/test_connection.py b/pymysql/tests/test_connection.py
@@ -5,6 +5,7 @@
 import pymysql
 from pymysql.tests import base
 from pymysql._compat import text_type
+from pymysql.constants import CLIENT
 
 
 class TempUser:
@@ -424,8 +425,8 @@ def test_connection_gone_away(self):
     def test_init_command(self):
         conn = pymysql.connect(
             init_command='SELECT "bar"; SELECT "baz"',
-            **self.databases[0]
-        )
+            client_flag=CLIENT.MULTI_STATEMENTS,
+            **self.databases[0])
         c = conn.cursor()
         c.execute('select "foobar";')
         self.assertEqual(('foobar',), c.fetchone())
@@ -568,7 +569,7 @@ def test_previous_cursor_not_closed(self):
         self.assertEqual(cur2.fetchone()[0], 3)
 
     def test_commit_during_multi_result(self):
-        con = self.connections[0]
+        con = self.connect(client_flag=CLIENT.MULTI_STATEMENTS)
         cur = con.cursor()
         cur.execute("SELECT 1; SELECT 2")
         con.commit()
