refactor the run integration tests flag

Author: Codeslayer666

test/test_integration/test_integration_test.py

@@ -21,10 +21,24 @@
 PASSWORD = os.environ.get('UPCLOUD_API_PASSWD')
 
 
-integration_test = pytest.mark.skipif(
-    not getattr(pytest, "--integration-tests", None),
-    reason='need --integration-tests option to run'
-)
+def pytest_addoption(parser):
+    parser.addoption(
+        "--integration-tests", action="store_true", default=False, help="run integration tests"
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line("markers", "interagtion: mark test as integration")
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--integration-tests"):
+        # --integration-tests given in cli: do not skip integration tests
+        return
+    integration_tests = pytest.mark.skip(reason="need --integration-tests option to run")
+    for item in items:
+        if "integration_test" in item.keywords:
+            item.add_marker(integration_tests)
 
 
 # globals to store created resources so we can cleanup after tests
@@ -42,7 +56,7 @@ def delete_tag(tag):
     tag.destroy()
 
 
-@integration_test
+@pytest.mark.integration_test
 def teardown_module(module):
     manager = CloudManager(USERNAME, PASSWORD, timeout=160)
 
@@ -61,7 +75,7 @@ def teardown_module(module):
             manager.delete_tag(tag)
 
 
-@integration_test
+@pytest.mark.integration_test
 def test_infra_ops():
     global CREATED_SERVERS
     global CREATED_TAGS