MySQL container configuration (#11)

* maria db test fix

* now it's possible to create mysql container without additional users, only with root

* MySqlContainer configuration by **kwargs

* version changed

Author: t0ch1k

setup.py

@@ -16,7 +16,7 @@
 setuptools.setup(
     name='testcontainers',
     packages=setuptools.find_packages(exclude=['tests']),
-    version='2.1.0',
+    version='2.1.1',
     description=('Library provides lightweight, throwaway '
                  'instances of common databases, '
                  'Selenium web browsers, or anything else that can '

testcontainers/mysql.py

@@ -16,21 +16,34 @@
 
 
 class MySqlContainer(DbContainer):
-    MYSQL_ROOT_PASSWORD = environ.get("MYSQL_ROOT_PASSWORD", "test")
-    MYSQL_DATABASE = environ.get("MYSQL_DATABASE", "test")
     MYSQL_USER = environ.get("MYSQL_USER", "test")
+    MYSQL_ROOT_PASSWORD = environ.get("MYSQL_ROOT_PASSWORD", "test")
     MYSQL_PASSWORD = environ.get("MYSQL_PASSWORD", "test")
+    MYSQL_DATABASE = environ.get("MYSQL_DATABASE", "test")
 
-    def __init__(self, image="mysql:latest"):
+    def __init__(self, image="mysql:latest", **kwargs):
         super(MySqlContainer, self).__init__(image)
         self.port_to_expose = 3306
         self.with_exposed_ports(self.port_to_expose)
+        if 'MYSQL_USER' in kwargs:
+            self.MYSQL_USER = kwargs['MYSQL_USER']
+        if 'MYSQL_ROOT_PASSWORD' in kwargs:
+            self.MYSQL_ROOT_PASSWORD = kwargs['MYSQL_ROOT_PASSWORD']
+        if 'MYSQL_PASSWORD' in kwargs:
+            self.MYSQL_PASSWORD = kwargs['MYSQL_PASSWORD']
+        if 'MYSQL_DATABASE' in kwargs:
+            self.MYSQL_DATABASE = kwargs['MYSQL_DATABASE']
+
+        if self.MYSQL_USER == 'root':
+            self.MYSQL_ROOT_PASSWORD = self.MYSQL_PASSWORD
 
     def _configure(self):
         self.with_env("MYSQL_ROOT_PASSWORD", self.MYSQL_ROOT_PASSWORD)
         self.with_env("MYSQL_DATABASE", self.MYSQL_DATABASE)
-        self.with_env("MYSQL_USER", self.MYSQL_USER)
-        self.with_env("MYSQL_PASSWORD", self.MYSQL_PASSWORD)
+
+        if self.MYSQL_USER != "root":
+            self.with_env("MYSQL_USER", self.MYSQL_USER)
+            self.with_env("MYSQL_PASSWORD", self.MYSQL_PASSWORD)
 
     def get_connection_url(self):
         return super()._create_connection_url(dialect="mysql+pymysql",

tests/test_db_containers.py

@@ -26,7 +26,7 @@ def test_docker_run_postgress():
 
 
 def test_docker_run_mariadb():
-    mariadb_container = MariaDbContainer("mariadb:latest")
+    mariadb_container = MariaDbContainer("mariadb:10.2.9")
     with mariadb_container as mariadb:
         e = sqlalchemy.create_engine(mariadb.get_connection_url())
         result = e.execute("select version()")