From 465ac6b62604d26a0bb76a7d1d6fdfc416798fdb Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 24 Apr 2019 14:50:15 +0200
Subject: [PATCH] Properly tag pytest tests
---
test/pytest/test_certs.py | 15 +++++++--------
test/pytest/test_docker.py | 5 +++++
test/pytest/test_system.py | 4 ++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/test/pytest/test_certs.py b/test/pytest/test_certs.py
index dddd46d9b..6fba74f42 100644
--- a/test/pytest/test_certs.py
+++ b/test/pytest/test_certs.py
@@ -9,8 +9,7 @@ import os
import pytest
-#@pytest.mark.xfail
-def test_cert_validation(url: str):
+def check_cert_url(url: str):
print('Testing URL: ', url)
buffer = BytesIO()
@@ -36,11 +35,11 @@ def test_cert_validation(url: str):
return valid_cert
-domain = os.environ.get("OAS_DOMAIN")
-assert domain, "Please export OAS_DOMAIN as environment variable."
+@pytest.mark.certs
+def test_cert_validation(host):
-#print(_testinfra_host)
-print(host)
+ domain = os.environ.get("OAS_DOMAIN")
+ assert domain, "Please export OAS_DOMAIN as environment variable."
-# Check traefik cert
-assert test_cert_validation('https://traefik.%s/' % domain)
+ # Check traefik cert
+ assert check_cert_url('https://traefik.%s/' % domain)
diff --git a/test/pytest/test_docker.py b/test/pytest/test_docker.py
index 9b2a0052a..ff116ccda 100644
--- a/test/pytest/test_docker.py
+++ b/test/pytest/test_docker.py
@@ -1,9 +1,14 @@
+import pytest
+
+
+@pytest.mark.testinfra
def test_docker_is_installed(host):
docker = host.package("docker-ce")
assert docker.is_installed
assert docker.version.startswith("5:18.09")
+@pytest.mark.testinfra
def test_docker_running_and_enabled(host):
docker = host.service("docker")
assert docker.is_running
diff --git a/test/pytest/test_system.py b/test/pytest/test_system.py
index 8df1b77e6..c41d9d084 100644
--- a/test/pytest/test_system.py
+++ b/test/pytest/test_system.py
@@ -1,3 +1,7 @@
+import pytest
+
+
+@pytest.mark.testinfra
def test_release_is_bionic(host):
system_info = host.system_info
assert system_info.release == '9.8'
--
GitLab