Fix retrieval of log filename path

[doctor.git] / doctor_tests / main.py

diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index 006aac9..111c93d 100644 (file)
--- a/doctor_tests/main.py
+++ b/doctor_tests/main.py
@@ -106,7 +106,7 @@ class DoctorTest(object):
             # NOTE (umar) copy remote monitor.log file when monitor=collectd
             self.check_host_status(self.down_host.name, 'down')
 
-            notification_time = calculate_notification_time()
+            notification_time = calculate_notification_time(LOG.filename)
             if notification_time < 1 and notification_time > 0:
                 LOG.info('doctor test successfully, notification_time=%s' % notification_time)
             else:
@@ -156,23 +156,22 @@ 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')
         reg = '(?<=doctor set link down at )\d+.\d+'
-        linkdown = float(match_rep_in_file(reg, log_file).group(0))
+        linkdown = float(match_rep_in_file(reg, LOG.filename).group(0))
 
-        log_file = '{0}/{1}'.format(sys.path[0], 'doctor.log')
         reg = '(.* doctor mark vm.* error at )(\d+.\d+)'
-        vmdown = float(match_rep_in_file(reg, log_file).group(2))
+        vmdown = float(match_rep_in_file(reg, LOG.filename).group(2))
 
-        reg = '(?<=doctor mark host.* down at )\d+.\d+'
-        hostdown = float(match_rep_in_file(reg, log_file).group(2))
+        reg = '(.* doctor mark host.* down at )(\d+.\d+)'
+        hostdown = float(match_rep_in_file(reg, LOG.filename).group(2))
 
         reg = '(?<=doctor monitor detected at )\d+.\d+'
-        detected = float(match_rep_in_file(reg, log_file).group(0))
+        detected = float(match_rep_in_file(reg, LOG.filename).group(0))
 
         reg = '(?<=doctor consumer notified at )\d+.\d+'
-        notified = float(match_rep_in_file(reg, log_file).group(0))
+        notified = float(match_rep_in_file(reg, LOG.filename).group(0))
 
         # TODO(yujunz) check the actual delay to verify time sync status
         # expected ~1s delay from $trigger to $linkdown