Update to new version 5.4HEADstable/jermamaster

Signed-off-by: Thomas Duval <thomas.duval@orange.com>
Change-Id: Idcd868133d75928a1ffd74d749ce98503e0555ea

1 files changed, 0 insertions, 52 deletions

diff --git a/python_moonclient/tests/unit_python/conftest.py b/python_moonclient/tests/unit_python/conftest.py
deleted file mode 100644
index bd3e5f4d..00000000
--- a/python_moonclient/tests/unit_python/conftest.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import pytest
-import requests_mock
-from . import mock_config
-
-from .conf.conf_projects import *
-from .conf.conf_models import *
-from .conf.conf_pdps import *
-from .conf.conf_action_categories import *
-from .conf.conf_object_categories import *
-from .conf.conf_subject_categories import *
-from .conf.conf_meta_rules import *
-from .conf.conf_action_assignments import *
-from .conf.conf_object_assignments import *
-from .conf.conf_subject_assignments import *
-from .conf.conf_policies import *
-from .conf.conf_subjects import *
-from .conf.conf_objects import *
-from .conf.conf_actions import *
-from .conf.conf_subject_data import *
-from .conf.conf_object_data import *
-from .conf.conf_action_data import *
-from .conf.conf_rules import *
-
-
-@pytest.fixture(autouse=True)
-def no_requests(monkeypatch):
-    """ Modify the response from Requests module
-    """
-    with requests_mock.Mocker(real_http=True) as m:
-        mock_config.register_consul(m)
-
-        conf_projects(m)
-        conf_models(m)
-        conf_pdps(m)
-        conf_action_categories(m)
-        conf_object_categories(m)
-        conf_subject_categories(m)
-        conf_meta_rules(m)
-        conf_policies(m)
-        conf_subjects(m)
-        conf_objects(m)
-        conf_actions(m)
-        conf_object_data(m)
-        conf_subject_data(m)
-        conf_action_data(m)
-        conf_action_assignments(m)
-        conf_object_assignments(m)
-        conf_subject_assignments(m)
-        conf_rule_assignments(m)
-        yield m
-
-