summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--tests/lib/installers/apex2
-rw-r--r--tests/main.py2
-rwxr-xr-xtests/run.sh9
-rw-r--r--tox.ini5
5 files changed, 13 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 65b51a69..84d085d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*~
+*.pyc
.*.sw?
**.log
/docs_build/
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 45683d1e..1cd2b1d2 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -76,7 +76,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 fda1e753..713e494b 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
diff --git a/tox.ini b/tox.ini
index 2f74083f..e75a3741 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.3.1
-envlist = verify
+envlist = py34
skipsdist = True
[testenv]
@@ -20,7 +20,6 @@ passenv =
PROFILER_TYPE
PYTHON_ENABLE
CI_DEBUG
-
-[testenv:verify]
changedir = {toxinidir}/tests
commands = python main.py
+