Merge "support pep8 check"

[doctor.git] / tests / run.sh

diff --git a/tests/run.sh b/tests/run.sh
index 69f18b2..b5c5687 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -29,7 +29,7 @@ DOCTOR_USER=doctor
 DOCTOR_PW=doctor
 DOCTOR_PROJECT=doctor
 DOCTOR_ROLE=_member_
-PROFILER_TYPE=${PROFILER_TYPE:-none}
+PROFILER_TYPE=${PROFILER_TYPE:-poc}
 PYTHON_ENABLE=${PYTHON_ENABLE:-false}
 
 TOP_DIR=$(cd $(dirname "$0") && pwd)
@@ -42,6 +42,8 @@ ceilometer="ceilometer $as_doctor_user"
 as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT
                --os-tenant-name $DOCTOR_PROJECT"
 
+upper_constraints="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata"
+pip_install="pip install -c${upper_constraints}"
 
 # Functions
 
@@ -421,7 +423,7 @@ run_profiler() {
         export DOCTOR_PROFILER_T09=$(python -c \
           "print(int(($notified-$relative_start)*1000))")
 
-        python profiler-poc.py >doctor_profiler.log 2>&1
+        python profiler_poc.py > doctor_profiler.log 2>&1
     fi
 }
 
@@ -477,16 +479,16 @@ cleanup() {
 }
 
 setup_python_packages() {
-    sudo pip install flask==0.10.1
-    command -v openstack || sudo pip install python-openstackclient==2.3.0
-    command -v ceilometer || sudo pip install python-ceilometerclient==2.6.2
-    command -v congress || sudo pip install python-congressclient==1.5.0
+    pip freeze |grep -i flask\= > /dev/null || sudo ${pip_install} flask
+    command -v openstack || sudo ${pip_install} python-openstackclient
+    command -v ceilometer || sudo ${pip_install} python-ceilometerclient
+    command -v congress || sudo ${pip_install} python-congressclient
 }
 
 # Main process
 
 if [[ $PYTHON_ENABLE == [Tt]rue ]]; then
-    which tox || sudo pip install tox
+    which tox || sudo ${pip_install} tox
     if [ -f /usr/bin/apt-get ]; then
         sudo apt-get install -y python3-dev
     elif [ -f /usr/bin/yum ] ; then