Ignore pylint message R0903
R0903: Too few public methods
This rule was disabled, since it does not make sense for some classes.
Change-Id: I682aaeb496594eed222cf59140d7cc08224fa3fc
diff --git a/.pylintrc b/.pylintrc
index 29e2e39..12aa73b 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,5 +1,5 @@
[MESSAGES CONTROL]
-disable=C0111, W0621, R0201, R0913
+disable=C0111, W0621, R0201, R0913, R0903
[BASIC]
no-docstring-rgx=(test_.*)|(__.*__)
diff --git a/tests/container-images/conftest.py b/tests/container-images/conftest.py
index d2b2caf..0d47f37 100644
--- a/tests/container-images/conftest.py
+++ b/tests/container-images/conftest.py
@@ -29,15 +29,6 @@
self.mysql_container = None
- self._start_mysql_container()
-
- def connect(self):
- engine = create_engine(
- "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):
connection = None
while connection is None:
@@ -48,7 +39,14 @@
time.sleep(1)
connection.close()
- def _start_mysql_container(self):
+ def connect(self):
+ engine = create_engine(
+ "mysql+pymysql://root:%s@localhost:%s" % (
+ self.mysql_config["MYSQL_ROOT_PASSWORD"],
+ self.mysql_config["MYSQL_PORT"]))
+ return engine.connect()
+
+ def start(self):
self.mysql_container = self.docker_client.containers.run(
image="mysql:5.5.61",
environment={
@@ -66,7 +64,7 @@
self._wait_for_db_connection()
- def stop_mysql_container(self):
+ def stop(self):
self.mysql_container.stop(timeout=1)
@pytest.fixture(scope="session")
@@ -90,8 +88,6 @@
self.gerrit_container = None
- self._start_gerrit_container()
-
def _create_config_files(self):
tmp_config_dir = os.path.join(self.tmp_dir, "configs")
if not os.path.isdir(tmp_config_dir):
@@ -115,7 +111,7 @@
}
return volumes
- def _start_gerrit_container(self):
+ def start(self):
self.gerrit_container = self.docker_client.containers.run(
image=self.image.id,
user="gerrit",
@@ -128,7 +124,7 @@
auto_remove=True
)
- def stop_gerrit_container(self):
+ def stop(self):
self.gerrit_container.stop(timeout=1)
@pytest.fixture(scope="session")
diff --git a/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py b/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py
index 885bc6e..f5adda0 100644
--- a/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py
+++ b/tests/container-images/gerrit-slave/test_container_integration_gerrit_slave.py
@@ -58,8 +58,9 @@
"""}
test_setup = gerrit_container_factory(
docker_client, docker_network, tmp_dir, gerrit_slave_image, configs, 8081)
+ test_setup.start()
- request.addfinalizer(test_setup.stop_gerrit_container)
+ request.addfinalizer(test_setup.stop)
return test_setup.gerrit_container
@@ -82,8 +83,9 @@
"""}
test_setup = gerrit_container_factory(
docker_client, docker_network, tmp_dir, gerrit_slave_image, configs, 8082)
+ test_setup.start()
- request.addfinalizer(test_setup.stop_gerrit_container)
+ request.addfinalizer(test_setup.stop)
return test_setup.gerrit_container
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 2d4e891..ace97df 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
@@ -53,8 +53,9 @@
def mysql_container(request, docker_client, docker_network, mysql_container_factory):
mysql_container = mysql_container_factory(
docker_client, docker_network, MYSQL_CONFIG)
+ mysql_container.start()
- request.addfinalizer(mysql_container.stop_mysql_container)
+ request.addfinalizer(mysql_container.stop)
return mysql_container
