diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/consumer.py | 1 | ||||
| -rw-r--r-- | tests/identity_auth.py | 10 | ||||
| -rw-r--r-- | tests/inspector.py | 1 | ||||
| -rw-r--r-- | tests/monitor.py | 7 | ||||
| -rwxr-xr-x | tests/run.sh | 8 |
5 files changed, 18 insertions, 9 deletions
diff --git a/tests/consumer.py b/tests/consumer.py index 3c012b4f..042cf20a 100644 --- a/tests/consumer.py +++ b/tests/consumer.py @@ -12,7 +12,6 @@ from flask import Flask from flask import request import json import logger as doctor_log -import os import time LOG = doctor_log.Logger('doctor_consumer').getLogger() diff --git a/tests/identity_auth.py b/tests/identity_auth.py index a40c41cf..ffecc68a 100644 --- a/tests/identity_auth.py +++ b/tests/identity_auth.py @@ -17,9 +17,11 @@ def get_identity_auth(): auth_url = os.environ['OS_AUTH_URL'] username = os.environ['OS_USERNAME'] password = os.environ['OS_PASSWORD'] - user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') + user_domain_name = os.environ.get('OS_USER_DOMAIN_NAME') or 'default' + user_domain_id = os.environ.get('OS_USER_DOMAIN_ID') or 'default' project_name = os.environ.get('OS_PROJECT_NAME') or os.environ.get('OS_TENANT_NAME') - project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') + project_domain_name = os.environ.get('OS_PROJECT_DOMAIN_NAME') or 'default' + project_domain_id = os.environ.get('OS_PROJECT_DOMAIN_ID') or 'default' loader = loading.get_plugin_loader('password') return loader.load_from_options( @@ -27,9 +29,11 @@ def get_identity_auth(): username=username, password=password, user_domain_name=user_domain_name, + user_domain_id=user_domain_id, project_name=project_name, tenant_name=project_name, - project_domain_name=project_domain_name) + project_domain_name=project_domain_name, + project_domain_id=project_domain_id) def get_session(auth=None): diff --git a/tests/inspector.py b/tests/inspector.py index ba00f40e..d11da299 100644 --- a/tests/inspector.py +++ b/tests/inspector.py @@ -13,7 +13,6 @@ from flask import Flask from flask import request import json import logger as doctor_log -import os import threading import time diff --git a/tests/monitor.py b/tests/monitor.py index 8e8aa7a5..7450c534 100644 --- a/tests/monitor.py +++ b/tests/monitor.py @@ -11,12 +11,11 @@ import argparse from datetime import datetime import json import logger as doctor_log -import os import requests import socket -import sys import time +from keystoneauth1 import session from congressclient.v1 import client import identity_auth @@ -48,8 +47,8 @@ class DoctorMonitorSample(object): self.inspector_url = 'http://127.0.0.1:12345/events' elif self.inspector_type == 'congress': auth=identity_auth.get_identity_auth() - sess=session.Session(auth=auth) - congress = client.Client(session=sess, service_type='policy') + self.session=session.Session(auth=auth) + congress = client.Client(session=self.session, service_type='policy') ds = congress.list_datasources()['results'] doctor_ds = next((item for item in ds if item['driver'] == 'doctor'), None) diff --git a/tests/run.sh b/tests/run.sh index 34a52878..fda1e753 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -30,6 +30,7 @@ DOCTOR_PW=doctor DOCTOR_PROJECT=doctor DOCTOR_ROLE=_member_ PROFILER_TYPE=${PROFILER_TYPE:-none} +PYTHON_ENABLE=${PYTHON_ENABLE:-false} TOP_DIR=$(cd $(dirname "$0") && pwd) @@ -479,6 +480,13 @@ cleanup() { # Main process +if $PYTHON_ENABLE; then + cd $TOP_DIR + echo "executing tox..." + tox + exit $? +fi + echo "Note: doctor/tests/run.sh has been executed." git log --oneline -1 || true # ignore even you don't have git installed |