Add a mark for integration tests
Change-Id: I250e1daeb1a251726f0b596ecdeb945105d3415c
diff --git a/README.md b/README.md
index 116340f..9cda08a 100644
--- a/README.md
+++ b/README.md
@@ -208,6 +208,12 @@
Marks test classes in which the contained test functions have to run
incrementally.
+### integration
+
+Marks integration tests. These tests test interactions between containers,
+between outside clients and containers and between the components installed
+by a helm chart.
+
### slow
Marks tests that need an above average time to run.
diff --git a/setup.cfg b/setup.cfg
index d8a3c71..7708c62 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,5 +4,6 @@
markers =
docker: Tests that require to run and interact with a docker container
incremental: Test classes containing tests that need to run incrementally
+ integration: Integration tests
slow: Tests that run slower than the average test
structure: Structure tests
diff --git a/tests/container-images/apache-git-http-backend/test_container_disable_protocol_apache_git_http_backend.py b/tests/container-images/apache-git-http-backend/test_container_disable_protocol_apache_git_http_backend.py
index 57d6a0d..d75d13f 100755
--- a/tests/container-images/apache-git-http-backend/test_container_disable_protocol_apache_git_http_backend.py
+++ b/tests/container-images/apache-git-http-backend/test_container_disable_protocol_apache_git_http_backend.py
@@ -38,6 +38,7 @@
@pytest.mark.docker
+@pytest.mark.integration
@pytest.mark.slow
def test_apache_git_http_backend_disable_protocol(
container_run_with_disabled_protocol,
diff --git a/tests/container-images/apache-git-http-backend/test_container_integration_apache_git_http_backend.py b/tests/container-images/apache-git-http-backend/test_container_integration_apache_git_http_backend.py
index f8350d1..8a3efde 100755
--- a/tests/container-images/apache-git-http-backend/test_container_integration_apache_git_http_backend.py
+++ b/tests/container-images/apache-git-http-backend/test_container_integration_apache_git_http_backend.py
@@ -45,6 +45,7 @@
@pytest.mark.docker
+@pytest.mark.integration
def test_apache_git_http_backend_apache_running(
container_run, base_url, apache_credentials_dir
):
@@ -55,6 +56,7 @@
@pytest.mark.docker
+@pytest.mark.integration
def test_apache_git_http_backend_repo_creation(
container_run, apache_credentials_dir, basic_auth_creds, repo_creation_url
):
@@ -69,6 +71,7 @@
@pytest.mark.docker
+@pytest.mark.integration
def test_apache_git_http_backend_repo_creation_fails_without_credentials(
container_run, apache_credentials_dir, repo_creation_url
):
@@ -79,6 +82,7 @@
@pytest.mark.docker
+@pytest.mark.integration
def test_apache_git_http_backend_repo_creation_fails_wrong_fs_permissions(
container_run, apache_credentials_dir, basic_auth_creds, repo_creation_url
):
@@ -95,6 +99,7 @@
@pytest.mark.docker
+@pytest.mark.integration
def test_apache_git_http_backend_repo_creation_push_repo(
container_run,
base_url,
diff --git a/tests/container-images/gerrit-init/test_container_integration_gerrit_init.py b/tests/container-images/gerrit-init/test_container_integration_gerrit_init.py
index 3ea7d5e..057f5ba 100644
--- a/tests/container-images/gerrit-init/test_container_integration_gerrit_init.py
+++ b/tests/container-images/gerrit-init/test_container_integration_gerrit_init.py
@@ -62,6 +62,7 @@
@pytest.mark.docker
@pytest.mark.incremental
+@pytest.mark.integration
class TestGerritInitEmptySite:
@pytest.mark.timeout(60)
def test_gerrit_init_gerrit_is_initialized(self, container_run_default):
@@ -89,6 +90,7 @@
@pytest.mark.docker
@pytest.mark.incremental
+@pytest.mark.integration
class TestGerritInitPluginInstallation:
def test_gerrit_init_plugins_are_installed(self, container_run_endless):
exit_code, _ = container_run_endless.exec_run(
diff --git a/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py b/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py
index 17337b2..0cbdaf4 100644
--- a/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py
+++ b/tests/container-images/gerrit-master/test_container_integration_gerrit_master.py
@@ -71,6 +71,7 @@
@pytest.mark.docker
@pytest.mark.incremental
+@pytest.mark.integration
@pytest.mark.slow
class TestGerritMasterStartScript:
@pytest.mark.timeout(60)
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 363110e..9753258 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
@@ -71,6 +71,7 @@
@pytest.mark.docker
@pytest.mark.incremental
+@pytest.mark.integration
@pytest.mark.slow
class TestGerritSlave:
@pytest.fixture(params=CONFIG_FILES)
