fix the path of log file

Change-Id: I823bdc453c32decb0160f0915d749af4ac664908
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
(cherry picked from commit 1336b9add0dc6fb91fbf71431e3bfa1cd0dd89d6)

diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index 006aac9..de45510 100644 (file)
--- a/doctor_tests/main.py
+++ b/doctor_tests/main.py
@@ -156,16 +156,17 @@ class DoctorTest(object):
         self.fault.get_disable_network_log()
 
     def run_profiler(self):
+        test_dir = os.path.split(os.path.realpath(__file__))[0]
 
-        log_file = '{0}/{1}'.format(sys.path[0], 'disable_network.log')
+        log_file = '{0}/{1}'.format(test_dir, 'disable_network.log')
         reg = '(?<=doctor set link down at )\d+.\d+'
         linkdown = float(match_rep_in_file(reg, log_file).group(0))
 
-        log_file = '{0}/{1}'.format(sys.path[0], 'doctor.log')
+        log_file = '{0}/{1}'.format(test_dir, 'doctor.log')
         reg = '(.* doctor mark vm.* error at )(\d+.\d+)'
         vmdown = float(match_rep_in_file(reg, log_file).group(2))
 
-        reg = '(?<=doctor mark host.* down at )\d+.\d+'
+        reg = '(.* doctor mark host.* down at )(\d+.\d+)'
         hostdown = float(match_rep_in_file(reg, log_file).group(2))
 
         reg = '(?<=doctor monitor detected at )\d+.\d+'

diff --git a/doctor_tests/scenario/common.py b/doctor_tests/scenario/common.py
index a5cbe48..9344dca 100644 (file)
--- a/doctor_tests/scenario/common.py
+++ b/doctor_tests/scenario/common.py
@@ -6,13 +6,15 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import sys
+import os
 
 from doctor_tests.common.utils import match_rep_in_file
 
 
 def calculate_notification_time():
-    log_file = '{0}/{1}'.format(sys.path[0], 'doctor.log')
+    scenario_dir = os.path.split(os.path.realpath(__file__))[0]
+    doctor_tests_dir = os.path.dirname(scenario_dir)
+    log_file = '{0}/{1}'.format(doctor_tests_dir, 'doctor.log')
 
     reg = '(?<=doctor monitor detected at )\d+.\d+'
     result = match_rep_in_file(reg, log_file)