Attempted to move db completely to docker

Author: terricain

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 
 python:
-    - 3.5.3
     - 3.6
 
 env:
@@ -15,23 +14,33 @@ services:
 matrix:
    include:
         - python: 3.6
-          env: PYTHONASYNCIODEBUG=
-          addons:
-              mariadb: '5.5'
+          env:
+            - PYTHONASYNCIODEBUG=
+            - DB=mariadb
+            - DBTAG=5.5
         - python: 3.6
-          env: PYTHONASYNCIODEBUG=1
+          env:
+            - PYTHONASYNCIODEBUG=1
+            - DB=mariadb
+            - DBTAG=10.0
           addons:
               mariadb: '10.0'
         - python: 3.6
-          env: PYTHONASYNCIODEBUG=
-          addons:
-              mariadb: '10.1'
+          env:
+            - PYTHONASYNCIODEBUG=
+            - DB=mariadb
+            - DBTAG=10.5
+        - python: 3.6
+          env:
+            - PYTHONASYNCIODEBUG=
+            - DB=mysql
+            - DBTAG=5.7
 
 
-before_script:
-    - "mysql -e 'SELECT VERSION()'"
-    - "mysql -e 'DROP DATABASE IF EXISTS test_pymysql; create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
-    - "mysql -e 'DROP DATABASE IF EXISTS test_pymysql2; create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
+#before_script:
+#    - "mysql -e 'SELECT VERSION()'"
+#    - "mysql -e 'DROP DATABASE IF EXISTS test_pymysql; create database test_pymysql  DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
+#    - "mysql -e 'DROP DATABASE IF EXISTS test_pymysql2; create database test_pymysql2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'"
 
 install:
     - pip install -Ur requirements-dev.txt

tests/conftest.py

@@ -34,22 +34,27 @@ def pytest_generate_tests(metafunc):
     if 'loop_type' in metafunc.fixturenames:
         loop_type = ['asyncio', 'uvloop'] if uvloop else ['asyncio']
         metafunc.parametrize("loop_type", loop_type)
-
-    if 'mysql_tag' in metafunc.fixturenames:
-        tags = set(metafunc.config.option.mysql_tag)
-        if not tags:
-            tags = ['5.6', '8.0']
-        elif 'all' in tags:
-            tags = ['5.6', '5.7', '8.0']
-        else:
-            tags = list(tags)
-        metafunc.parametrize("mysql_tag", tags, scope='session')
+    #
+    # if 'mysql_tag' in metafunc.fixturenames:
+    #     tags = set(metafunc.config.option.mysql_tag)
+    #     if not tags:
+    #         tags = ['5.6', '8.0']
+    #     elif 'all' in tags:
+    #         tags = ['5.6', '5.7', '8.0']
+    #     else:
+    #         tags = list(tags)
+    #     metafunc.parametrize("mysql_tag", tags, scope='session')
 
 
 # This is here unless someone fixes the generate_tests bit
 @pytest.yield_fixture(scope='session')
 def mysql_tag():
-    return '5.6'
+    return os.environ.get('DBTAG', '10.5')
+
+
+@pytest.yield_fixture(scope='session')
+def mysql_image():
+    return os.environ.get('DB', 'mariadb')
 
 
 @pytest.yield_fixture
@@ -119,12 +124,10 @@ def pytest_addoption(parser):
 
 
 @pytest.fixture
-def mysql_params():
-    params = {"host": os.environ.get('MYSQL_HOST', 'localhost'),
-              "port": int(os.environ.get('MYSQL_PORT', 3306)),
-              "user": os.environ.get('MYSQL_USER', 'root'),
+def mysql_params(mysql_server):
+    params = {**mysql_server['conn_params'],
               "db": os.environ.get('MYSQL_DB', 'test_pymysql'),
-              "password": os.environ.get('MYSQL_PASSWORD', ''),
+              # "password": os.environ.get('MYSQL_PASSWORD', ''),
               "local_infile": True,
               "use_unicode": True,
               }
@@ -227,11 +230,11 @@ def ensure_mysql_verison(request, mysql_tag):
 
 
 @pytest.fixture(scope='session')
-def mysql_server(unused_port, docker, session_id, mysql_tag, request):
+def mysql_server(unused_port, docker, session_id, mysql_image, mysql_tag, request):
     print('\nSTARTUP CONTAINER - {0}\n'.format(mysql_tag))
 
     if not request.config.option.no_pull:
-        docker.pull('mysql:{}'.format(mysql_tag))
+        docker.pull('{}:{}'.format(mysql_image, mysql_tag))
 
     # bound IPs do not work on OSX
     host = "127.0.0.1"