[WIP] Cleanup and CI runner

tardis-sn · Nov 25, 2016 · 56dc896 · 56dc896
1 parent 46f0016
commit 56dc896
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -9,7 +9,7 @@ show-response = 1
 
 [pytest]
 minversion = 2.2
-norecursedirs = build docs/_build
+norecursedirs = build docs/_build tardis/tests/integration_tests
 
 [ah_bootstrap]
 auto_use = True

diff --git a/tardis/conftest.py b/tardis/conftest.py
@@ -66,12 +66,6 @@ def pytest_addoption(parser):
     _pytest_add_option(parser)
     parser.addoption("--atomic-dataset", dest='atomic-dataset', default=None,
                      help="filename for atomic dataset")
-    parser.addoption("--integration-tests", dest="integration-tests", default=None,
-                     help="path to configuration file for integration tests")
-    parser.addoption("--generate-reference", action="store_true", default=False,
-                     help="execute integration test run to generate reference data")
-    parser.addoption("--less-packets", action="store_true", default=False,
-                     help="Run integration tests with less packets.")
 
 
 # -------------------------------------------------------------------------

diff --git a/tardis/tests/coveragerc b/tardis/tests/coveragerc
@@ -20,5 +20,5 @@ exclude_lines =
    pragma: py{ignore_python_version}
 
 omit =
-   # Slow Tests should be run but need not appear in "html report"
-   tardis/tests/tests_slow/*
+   # Integration Tests should not appear in coveralls
+   tardis/tests/integration_tests/*
diff --git a/tardis/tests/integration_tests/conftest.py b/tardis/tests/integration_tests/conftest.py
@@ -8,6 +8,16 @@
 from tardis.tests.integration_tests.report import DokuReport
 from tardis.tests.integration_tests.plot_helpers import LocalPlotSaver, RemotePlotSaver
 
+def pytest_addoption(parser):
+    parser.addoption("--integration-tests",
+            dest="integration-tests", default=None,
+            help="path to configuration file for integration tests")
+    parser.addoption("--generate-reference",
+            action="store_true", default=False,
+            help="execute integration test run to generate reference data")
+    parser.addoption("--less-packets",
+            action="store_true", default=False,
+            help="Run integration tests with less packets.")
 
 def pytest_configure(config):
     integration_tests_configpath = config.getvalue("integration-tests")