From: wenjuan dong <dong.wenjuan@zte.com.cn>
Date: Thu, 27 Jul 2017 01:29:50 +0000 (+0000)
Subject: Merge "fix some bugs for python verify jobs:"
X-Git-Tag: opnfv-5.0.RC1~36
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3e0300e8f9695348aa4564f87a23ac3c0cf737ff;hp=-c;p=doctor.git

Merge "fix some bugs for python verify jobs:"
---

3e0300e8f9695348aa4564f87a23ac3c0cf737ff
diff --combined tests/main.py
index 182680ce,1cd2b1d2..797e28b2
--- a/tests/main.py
+++ b/tests/main.py
@@@ -14,7 -14,6 +14,7 @@@ from alarm import Alar
  import config
  from image import Image
  from instance import Instance
 +from inspector import get_inspector
  import logger as doctor_log
  from user import User
  from network import Network
@@@ -31,7 -30,6 +31,7 @@@ class DoctorTest(object)
          self.network = Network(self.conf, LOG)
          self.instance = Instance(self.conf, LOG)
          self.alarm = Alarm(self.conf, LOG)
 +        self.inspector = get_inspector(self.conf, LOG)
  
      def setup(self):
          # prepare the cloud env
@@@ -51,9 -49,6 +51,9 @@@
          # creating alarm...
          self.alarm.create()
  
 +        # starting doctor sample components...
 +        self.inspector.start()
 +
      def run(self):
          """run doctor test"""
          try:
@@@ -77,12 -72,11 +77,12 @@@
          self.network.delete()
          self.image.delete()
          self.user.delete()
 +        self.inspector.stop()
  
  
  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 --combined tests/run.sh
index b838adab,713e494b..5c922265
--- a/tests/run.sh
+++ b/tests/run.sh
@@@ -48,7 -48,7 +48,7 @@@ as_admin_user="--os-username admin --os
  get_compute_host_info() {
      # get computer host info which first VM boot in as admin user
      COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 |
 -                   grep "OS-EXT-SRV-ATTR:host" | awk '{ print $4 }')
 +                   grep "OS-EXT-SRV-ATTR:host " | awk '{ print $4 }')
      compute_host_in_undercloud=${COMPUTE_HOST%%.*}
      die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname"
  
@@@ -480,7 -480,14 +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