Ignore pylint message R0913
R0913: Too many arguments
While it is a good practice to not use too many arguments, pylint is too
strict on this, so this rule will be ignored.
This change also decreases the number of arguments where possible and
required.
Change-Id: Ib2d2b50c2cf300be95868ca285fd4f479af46f50
diff --git a/.pylintrc b/.pylintrc
index 0cc9b0b..29e2e39 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,5 +1,5 @@
[MESSAGES CONTROL]
-disable=C0111, W0621, R0201
+disable=C0111, W0621, R0201, R0913
[BASIC]
no-docstring-rgx=(test_.*)|(__.*__)
diff --git a/tests/container-images/conftest.py b/tests/container-images/conftest.py
index 66892fa..d2b2caf 100644
--- a/tests/container-images/conftest.py
+++ b/tests/container-images/conftest.py
@@ -22,12 +22,10 @@
class MySQLContainer():
- def __init__(self, docker_client, docker_network, host, port, root_pwd):
+ def __init__(self, docker_client, docker_network, mysql_config):
self.docker_client = docker_client
self.docker_network = docker_network
- self.host = host
- self.port = port
- self.root_pwd = root_pwd
+ self.mysql_config = mysql_config
self.mysql_container = None
@@ -35,7 +33,9 @@
def connect(self):
engine = create_engine(
- "mysql+pymysql://root:%s@localhost:%s" % (self.root_pwd, self.port))
+ "mysql+pymysql://root:%s@localhost:%s" % (
+ self.mysql_config["MYSQL_ROOT_PASSWORD"],
+ self.mysql_config["MYSQL_PORT"]))
return engine.connect()
def _wait_for_db_connection(self):
@@ -52,14 +52,14 @@
self.mysql_container = self.docker_client.containers.run(
image="mysql:5.5.61",
environment={
- "MYSQL_ROOT_PASSWORD": self.root_pwd,
+ "MYSQL_ROOT_PASSWORD": self.mysql_config["MYSQL_ROOT_PASSWORD"],
"MYSQL_DATABASE": "reviewdb"
},
ports={
- "3306": self.port
+ "3306": self.mysql_config["MYSQL_PORT"]
},
network=self.docker_network.name,
- name=self.host,
+ name=self.mysql_config["MYSQL_HOST"],
detach=True,
auto_remove=True
)
@@ -71,11 +71,12 @@
@pytest.fixture(scope="session")
def mysql_container_factory():
- def get_mysql_container(docker_client, docker_network, host, port, root_pwd):
- return MySQLContainer(docker_client, docker_network, host, port, root_pwd)
+ def get_mysql_container(docker_client, docker_network, mysql_config):
+ return MySQLContainer(docker_client, docker_network, mysql_config)
return get_mysql_container
+
class GerritContainer():
def __init__(self, docker_client, docker_network, tmp_dir, image,
diff --git a/tests/container-images/mysql-replication-init/test_container_integration_mysql_replication_init.py b/tests/container-images/mysql-replication-init/test_container_integration_mysql_replication_init.py
index 093b875..2d4e891 100644
--- a/tests/container-images/mysql-replication-init/test_container_integration_mysql_replication_init.py
+++ b/tests/container-images/mysql-replication-init/test_container_integration_mysql_replication_init.py
@@ -18,10 +18,12 @@
import pytest
-MYSQL_HOST = "k8sgerrit-mysql"
-MYSQL_PORT = 3306
-MYSQL_ROOT_PASSWORD = "big_secret"
-REPL_PASSWORD = "test"
+MYSQL_CONFIG = {
+ "MYSQL_HOST": "k8sgerrit-mysql",
+ "MYSQL_PORT": 3306,
+ "MYSQL_ROOT_PASSWORD": "big_secret",
+ "REPL_PASSWORD": "test"
+}
@pytest.fixture()
def mock_dump():
@@ -50,7 +52,7 @@
@pytest.fixture(scope="module")
def mysql_container(request, docker_client, docker_network, mysql_container_factory):
mysql_container = mysql_container_factory(
- docker_client, docker_network, MYSQL_HOST, MYSQL_PORT, MYSQL_ROOT_PASSWORD)
+ docker_client, docker_network, MYSQL_CONFIG)
request.addfinalizer(mysql_container.stop_mysql_container)
@@ -61,12 +63,7 @@
mysql_replication_init_image, mock_sql_script):
container_run = docker_client.containers.run(
image=mysql_replication_init_image.id,
- environment={
- "MYSQL_HOST": MYSQL_HOST,
- "MYSQL_PORT": MYSQL_PORT,
- "MYSQL_ROOT_PASSWORD": MYSQL_ROOT_PASSWORD,
- "REPL_PASSWORD": REPL_PASSWORD
- },
+ environment=MYSQL_CONFIG,
volumes={
mock_sql_script: {
"bind": "/var/sql",
@@ -138,4 +135,4 @@
result = connection.execute("SELECT password FROM users WHERE id=1 LIMIT 1;")
connection.close()
for row in result:
- assert REPL_PASSWORD in row["password"]
+ assert MYSQL_CONFIG["REPL_PASSWORD"] in row["password"]
