Module: check_mk
Branch: master
Commit: 8666dd98dec9ca8d3fb41766f6c455f253acabe4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8666dd98dec9ca…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 25 14:33:14 2017 +0100
Git-Tests von Integrationstests separiert
Change-Id: I125dfd5bc27d1c84e33785305824ba80e806a9ab
---
pytest.ini | 1 +
tests/agents/windows/test_precompiled_age.py | 4 ++++
tests/agents/windows/test_precompiled_cmk_update_agent.py | 4 ++++
tests/general/test_find_debug_print.py | 4 ++++
tests/general/test_permissions.py | 4 ++++
tests/packaging/test_files.py | 1 +
6 files changed, 18 insertions(+)
diff --git a/pytest.ini b/pytest.ini
index b4e450f..1282ff3 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -7,4 +7,5 @@ addopts = -rs -v --maxfail=1 -m "not packaging"
# Register some markers to classify the tests
markers =
pylint: Mark a test as pylint test.
+ git: Mark a test to be executed in the Git repository context
packaging: This is a test to execute to verify the packaging of the testbuilds.
diff --git a/tests/agents/windows/test_precompiled_age.py
b/tests/agents/windows/test_precompiled_age.py
index 04ac4ba..ccc303a 100644
--- a/tests/agents/windows/test_precompiled_age.py
+++ b/tests/agents/windows/test_precompiled_age.py
@@ -4,6 +4,10 @@
import os
import glob
from testlib import cmk_path
+import pytest
+
+# Mark all tests in this file to be executed in the git context
+pytestmark = pytest.mark.git
precompiled_files = [
'check_mk_agent.exe',
diff --git a/tests/agents/windows/test_precompiled_cmk_update_agent.py
b/tests/agents/windows/test_precompiled_cmk_update_agent.py
index b3a2b5d..5d91e58 100644
--- a/tests/agents/windows/test_precompiled_cmk_update_agent.py
+++ b/tests/agents/windows/test_precompiled_cmk_update_agent.py
@@ -4,6 +4,10 @@
import os
import glob
from testlib import cmc_path
+import pytest
+
+# Mark all tests in this file to be executed in the git context
+pytestmark = pytest.mark.git
precompiled_files = [
'plugins/cmk-update-agent.exe'
diff --git a/tests/general/test_find_debug_print.py
b/tests/general/test_find_debug_print.py
index 293bc94..2f751a7 100644
--- a/tests/general/test_find_debug_print.py
+++ b/tests/general/test_find_debug_print.py
@@ -4,6 +4,10 @@
import os
import glob
from testlib import cmk_path, cmc_path
+import pytest
+
+# Mark all tests in this file to be executed in the git context
+pytestmark = pytest.mark.git
check_paths = [
"bin",
diff --git a/tests/general/test_permissions.py b/tests/general/test_permissions.py
index 0d54475..7cfa766 100644
--- a/tests/general/test_permissions.py
+++ b/tests/general/test_permissions.py
@@ -4,6 +4,10 @@
import os
import glob
from testlib import cmk_path
+import pytest
+
+# Mark all tests in this file to be executed in the git context
+pytestmark = pytest.mark.git
def is_executable(path):
return os.path.isfile(path) and os.access(path, os.X_OK)
diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py
index 549d239..1b6bc83 100644
--- a/tests/packaging/test_files.py
+++ b/tests/packaging/test_files.py
@@ -3,6 +3,7 @@ import os
import subprocess
import re
+# Mark all tests in this file to be tests verifying build packages
pytestmark = pytest.mark.packaging
@pytest.mark.parametrize("what", [