Fixed bug where MYSQL_PORT wasn't being respected

Author: terricain

tests/base.py

@@ -30,7 +30,7 @@ def _connect_all(self):
     def setUp(self):
         super(AIOPyMySQLTestCase, self).setUp()
         self.host = os.environ.get('MYSQL_HOST', 'localhost')
-        self.port = os.environ.get('MYSQL_PORT', 3306)
+        self.port = int(os.environ.get('MYSQL_PORT', 3306))
         self.user = os.environ.get('MYSQL_USER', 'root')
         self.db = os.environ.get('MYSQL_DB', 'test_pymysql')
         self.other_db = os.environ.get('OTHER_MYSQL_DB', 'test_pymysql2')
@@ -47,7 +47,7 @@ def tearDown(self):
 
     @asyncio.coroutine
     def connect(self, host=None, user=None, password=None,
-                db=None, use_unicode=True, no_delay=None, **kwargs):
+                db=None, use_unicode=True, no_delay=None, port=None, **kwargs):
         if host is None:
             host = self.host
         if user is None:
@@ -56,16 +56,20 @@ def connect(self, host=None, user=None, password=None,
             password = self.password
         if db is None:
             db = self.db
+        if port is None:
+            port = self.port
         conn = yield from aiomysql.connect(loop=self.loop, host=host,
                                            user=user, password=password,
                                            db=db, use_unicode=use_unicode,
-                                           no_delay=no_delay, **kwargs)
+                                           no_delay=no_delay, port=port,
+                                           **kwargs)
         self.addCleanup(conn.close)
         return conn
 
     @asyncio.coroutine
     def create_pool(self, host=None, user=None, password=None,
-                    db=None, use_unicode=True, no_delay=None, **kwargs):
+                    db=None, use_unicode=True, no_delay=None,
+                    port=None, **kwargs):
         if host is None:
             host = self.host
         if user is None:
@@ -74,9 +78,12 @@ def create_pool(self, host=None, user=None, password=None,
             password = self.password
         if db is None:
             db = self.db
+        if port is None:
+            port = self.port
         pool = yield from aiomysql.create_pool(loop=self.loop, host=host,
                                                user=user, password=password,
                                                db=db, use_unicode=use_unicode,
-                                               no_delay=no_delay, **kwargs)
+                                               no_delay=no_delay, port=port,
+                                               **kwargs)
         self.addCleanup(pool.close)
         return pool

tests/conftest.py

@@ -80,7 +80,7 @@ def pytest_ignore_collect(path, config):
 @pytest.fixture
 def mysql_params():
     params = {"host": os.environ.get('MYSQL_HOST', 'localhost'),
-              "port": os.environ.get('MYSQL_PORT', 3306),
+              "port": int(os.environ.get('MYSQL_PORT', 3306)),
               "user": os.environ.get('MYSQL_USER', 'root'),
               "db": os.environ.get('MYSQL_DB', 'test_pymysql'),
               "password": os.environ.get('MYSQL_PASSWORD', ''),

tests/sa/test_sa_connection.py

@@ -22,7 +22,7 @@ def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
         self.host = os.environ.get('MYSQL_HOST', 'localhost')
-        self.port = os.environ.get('MYSQL_PORT', 3306)
+        self.port = int(os.environ.get('MYSQL_PORT', 3306))
         self.user = os.environ.get('MYSQL_USER', 'root')
         self.db = os.environ.get('MYSQL_DB', 'test_pymysql')
         self.password = os.environ.get('MYSQL_PASSWORD', '')
@@ -37,6 +37,7 @@ def connect(self, **kwargs):
                                   password=self.password,
                                   host=self.host,
                                   loop=self.loop,
+                                  port=self.port,
                                   **kwargs)
         yield from conn.autocommit(True)
         cur = yield from conn.cursor()

tests/sa/test_sa_engine.py

@@ -19,7 +19,7 @@ def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
         self.host = os.environ.get('MYSQL_HOST', 'localhost')
-        self.port = os.environ.get('MYSQL_PORT', 3306)
+        self.port = int(os.environ.get('MYSQL_PORT', 3306))
         self.user = os.environ.get('MYSQL_USER', 'root')
         self.db = os.environ.get('MYSQL_DB', 'test_pymysql')
         self.password = os.environ.get('MYSQL_PASSWORD', '')
@@ -38,6 +38,7 @@ def make_engine(self, use_loop=True, **kwargs):
                                                 user=self.user,
                                                 password=self.password,
                                                 host=self.host,
+                                                port=self.port,
                                                 loop=self.loop,
                                                 minsize=10,
                                                 **kwargs))
@@ -46,6 +47,7 @@ def make_engine(self, use_loop=True, **kwargs):
                                                 user=self.user,
                                                 password=self.password,
                                                 host=self.host,
+                                                port=self.port,
                                                 minsize=10,
                                                 **kwargs))
 

tests/sa/test_sa_transaction.py

@@ -33,7 +33,7 @@ def setUp(self):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(None)
         self.host = os.environ.get('MYSQL_HOST', 'localhost')
-        self.port = os.environ.get('MYSQL_PORT', 3306)
+        self.port = int(os.environ.get('MYSQL_PORT', 3306))
         self.user = os.environ.get('MYSQL_USER', 'root')
         self.db = os.environ.get('MYSQL_DB', 'test_pymysql')
         self.password = os.environ.get('MYSQL_PASSWORD', '')
@@ -58,6 +58,7 @@ def connect(self, **kwargs):
                                   user=self.user,
                                   password=self.password,
                                   host=self.host,
+                                  port=self.port,
                                   loop=self.loop,
                                   **kwargs)
         # TODO: fix this, should autocommit be enabled by default?