diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mock_settings.py | 13 | ||||
| -rw-r--r-- | tests/test_policyhandler.py | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/tests/mock_settings.py b/tests/mock_settings.py index f211dde..dddba7e 100644 --- a/tests/mock_settings.py +++ b/tests/mock_settings.py @@ -15,22 +15,17 @@ # ============LICENSE_END========================================================= # # ECOMP is a trademark and service mark of AT&T Intellectual Property. +"""settings that are general to all tests""" import json import logging -import subprocess import sys import uuid from datetime import datetime +from policyhandler import LogWriter from policyhandler.config import Config from policyhandler.onap.audit import Audit -from policyhandler.policy_handler import LogWriter - -try: - POLICY_HANDLER_VERSION = subprocess.check_output(["python", "setup.py", "--version"]).strip() -except subprocess.CalledProcessError: - POLICY_HANDLER_VERSION = "2.4.1" class Settings(object): @@ -56,9 +51,9 @@ class Settings(object): sys.stdout = LogWriter(Settings.logger.info) sys.stderr = LogWriter(Settings.logger.error) - print "print ========== run_policy_handler ==========" + print("print ========== run_policy_handler ==========") Settings.logger.info("========== run_policy_handler ==========") - Audit.init(Config.get_system_name(), POLICY_HANDLER_VERSION, Config.LOGGER_CONFIG_FILE_PATH) + Audit.init(Config.get_system_name(), Config.LOGGER_CONFIG_FILE_PATH) Settings.logger.info("starting policy_handler with config:") Settings.logger.info(Audit.log_json_dumps(Config.config)) diff --git a/tests/test_policyhandler.py b/tests/test_policyhandler.py index a775ea7..097a8e1 100644 --- a/tests/test_policyhandler.py +++ b/tests/test_policyhandler.py @@ -196,7 +196,7 @@ class MonkeyPolicyEngine(object): LATEST_POLICIES: dict((k, v) for k, v in MonkeyPolicyEngine.gen_all_policies_latest() - [LATEST_POLICIES].iteritems() + [LATEST_POLICIES].items() if re.match(match_to_policy_name, k)), ERRORED_SCOPES: [], ERRORED_POLICIES: {} |