diff options
| author |   wenjuan dong <dong.wenjuan@zte.com.cn> | 2017-07-27 01:29:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-27 01:29:50 +0000 |
| commit | 3e0300e8f9695348aa4564f87a23ac3c0cf737ff (patch) | |
| tree | 7d052cb88d375f6fb731f7c75d5a54510a272170 /tests | |
| parent | 6b117129e778b4877b17cf594aec57fb029cb83d (diff) | |
| parent | cbb58ee4050a201c0125b0b0b1a7c8f162925849 (diff) | |
Merge "fix some bugs for python verify jobs:"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/installers/apex | 2 | ||||
| -rw-r--r-- | tests/main.py | 2 | ||||
| -rwxr-xr-x | tests/run.sh | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/lib/installers/apex b/tests/lib/installers/apex index 55878dec..3d94e1c4 100644 --- a/tests/lib/installers/apex +++ b/tests/lib/installers/apex @@ -5,7 +5,7 @@ ssh_opts_cpu="$ssh_opts -i instack_key" function get_installer_ip { is_set INSTALLER_IP && return - INSTALLER_IP=$(get_first_vnic_ip instack) + INSTALLER_IP=$(get_first_vnic_ip undercloud) } function installer_get_ssh_keys { diff --git a/tests/main.py b/tests/main.py index 182680ce..797e28b2 100644 --- a/tests/main.py +++ b/tests/main.py @@ -82,7 +82,7 @@ class DoctorTest(object): def main(): """doctor main""" - doctor_root_dir = os.path.dirname(os.getcwd()) + doctor_root_dir = os.path.dirname(sys.path[0]) config_file_dir = '{0}/{1}'.format(doctor_root_dir, 'etc/') config_files = [join(config_file_dir, f) for f in os.listdir(config_file_dir) if isfile(join(config_file_dir, f))] diff --git a/tests/run.sh b/tests/run.sh index b838adab..5c922265 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -480,7 +480,14 @@ cleanup() { # Main process -if $PYTHON_ENABLE; then +if [[ $PYTHON_ENABLE == [Tt]rue ]]; then + 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 + sudo yum install -y python3-devel + fi + cd $TOP_DIR echo "executing tox..." tox |