Skip to content

Commit

Permalink
SAASDEV-2204: skip docker tests for CSE
Browse files Browse the repository at this point in the history
Change-Id: Ie64757ded5ac2989a606ca435c12b693edcb5e51
  • Loading branch information
Pablo Municio committed Oct 3, 2024
1 parent b9a913e commit ecf95f1
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions tests/docker/test_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@

from cmk.ccc.version import Edition, Version, versions_compatible

# Apply the skipif marker to all tests in this file for SaaS edition
pytestmark = [
pytest.mark.skipif(
version_from_env().is_saas_edition(),
reason="CSE has its own docker entrypoint which is covered in SaaS tests",
)
]

logger = logging.getLogger()

old_version = CMKVersion(
Expand Down Expand Up @@ -312,9 +320,6 @@ def test_redirects_work_with_custom_port(client: docker.DockerClient) -> None:
assert response.headers["Location"] == "http://%s/cmk/" % address[0]


@pytest.mark.skipif(
version_from_env().is_saas_edition(), reason="SaaS edition replaced the login screen"
)
def test_http_access_login_screen(checkmk: docker.models.containers.Container) -> None:
ip = get_container_ip(checkmk)

Expand All @@ -328,8 +333,6 @@ def test_http_access_login_screen(checkmk: docker.models.containers.Container) -
assert 'name="_login"' in response.text, "Login field not found!"


@pytest.mark.skip(reason="SaaS edition requires cognito config")
# @pytest.mark.skipif(not version_from_env().is_saas_edition(), reason="SaaS check saas login")
def test_http_access_login_screen_saas(checkmk: docker.models.containers.Container) -> None:
ip = get_container_ip(checkmk)

Expand Down

0 comments on commit ecf95f1

Please sign in to comment.