Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly report why the test_module suite is skipped #7270

Merged
merged 3 commits into from
Jun 6, 2018
Merged

Correctly report why the test_module suite is skipped #7270

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc14a95
Correctly report why the test_module suite is skipped
ph Jun 5, 2018
b3cc444
missing statement
ph Jun 5, 2018
44e4209
missing
ph Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions filebeat/tests/system/test_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ def init(self):
self.index_name = "test-filebeat-modules"

@parameterized.expand(load_fileset_test_cases)
@unittest.skipIf(not INTEGRATION_TESTS or
os.getenv("TESTING_ENVIRONMENT") == "2x",
@unittest.skipIf(not INTEGRATION_TESTS,
"integration tests are disabled, run with INTEGRATION_TESTS=1 to enable them.")
@unittest.skipIf(os.getenv("TESTING_ENVIRONMENT") == "2x",
"integration test not available on 2.x")
def test_fileset_file(self, module, fileset, test_file):
self.init()
Expand Down Expand Up @@ -169,8 +170,9 @@ def run_on_file(self, module, fileset, test_file, cfgfile):
if os.path.exists(test_file + "-expected.json"):
self._test_expected_events(module, test_file, res, objects)

@unittest.skipIf(not INTEGRATION_TESTS or
os.getenv("TESTING_ENVIRONMENT") == "2x",
@unittest.skipIf(not INTEGRATION_TESTS,
"integration tests are disabled, run with INTEGRATION_TESTS=1 to enable them.")
@unittest.skipIf(os.getenv("TESTING_ENVIRONMENT") == "2x",
"integration test not available on 2.x")
def test_input_pipeline_config(self):
"""
Expand Down Expand Up @@ -233,8 +235,9 @@ def search_objects():
o = objects[0]
assert o["x-pipeline"] == "test-pipeline"

@unittest.skipIf(not INTEGRATION_TESTS or
os.getenv("TESTING_ENVIRONMENT") == "2x",
@unittest.skipIf(not INTEGRATION_TESTS,
"integration tests are disabled, run with INTEGRATION_TESTS=1 to enable them.")
@unittest.skipIf(os.getenv("TESTING_ENVIRONMENT") == "2x",
"integration test not available on 2.x")
def test_ml_setup(self):
""" Test ML are installed in all possible ways """
Expand Down