From 17d1bd8c4c8fbd81af85edbde059a28a852a0deb Mon Sep 17 00:00:00 2001 From: Thomas Duval Date: Wed, 3 Jan 2018 14:23:22 +0100 Subject: Clean the code and fix some bugs Change-Id: I540aeea0af749f86f4c2378864b17d277517b85f --- moon_interface/tests/unit_python/api/test_authz.py | 2 +- moon_interface/tests/unit_python/conftest.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'moon_interface/tests') diff --git a/moon_interface/tests/unit_python/api/test_authz.py b/moon_interface/tests/unit_python/api/test_authz.py index a63948f8..84605203 100644 --- a/moon_interface/tests/unit_python/api/test_authz.py +++ b/moon_interface/tests/unit_python/api/test_authz.py @@ -7,7 +7,7 @@ def get_json(data): def test_authz_true(context): import moon_interface.server - server = moon_interface.server.main() + server = moon_interface.server.create_server() client = server.app.test_client() req = client.get("/authz/{p_id}/{s_id}/{o_id}/{a_id}".format( p_id=context["project_id"], diff --git a/moon_interface/tests/unit_python/conftest.py b/moon_interface/tests/unit_python/conftest.py index 1f4e8cfa..35ee19d7 100644 --- a/moon_interface/tests/unit_python/conftest.py +++ b/moon_interface/tests/unit_python/conftest.py @@ -5,7 +5,6 @@ import pickle import pytest import requests_mock from uuid import uuid4 -from requests.packages.urllib3.response import HTTPResponse CONF = { "openstack": { @@ -205,7 +204,7 @@ def set_env_variables(): def get_pickled_context(): - from python_moonutilities.security_functions import Context + from python_moonutilities.context import Context from python_moonutilities.cache import Cache CACHE = Cache() CACHE.update() -- cgit 1.2.3-korg