Removing temporary process group solution.

[doctor.git] / doctor_tests / main.py

diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index efbd8c6..3f54fc3 100644 (file)
--- a/doctor_tests/main.py
+++ b/doctor_tests/main.py
@@ -9,7 +9,6 @@
 import os
 from os.path import isfile, join
 import random
-import signal
 import sys
 import time
 
@@ -102,7 +101,8 @@ class DoctorTest(object):
             # wait for aodh alarms are updated in caches for event evaluator,
             # sleep time should be larger than event_alarm_cache_ttl
             # (default 60)
-            time.sleep(60)
+            # (tojuvone) Fraser currently needs 120
+            time.sleep(120)
 
             # injecting host failure...
             # NOTE (umar) add INTERFACE_NAME logic to host injection
@@ -257,16 +257,10 @@ class DoctorTest(object):
         self.installer.cleanup()
         self.image.delete()
         self.user.delete()
-        # Kill possible hanging subprocess
-        os.killpg(0, signal.SIGKILL)
 
 
 def main():
     """doctor main"""
-    # TODO (tojuvone): JIRA DOCTOR-123: Test cases have some issue to always
-    # kill all subprocesses. To ensure they are killed this group is done so
-    # all processes can be killed without knowing what they are.
-    os.setpgrp()
     test_dir = os.path.split(os.path.realpath(__file__))[0]
     doctor_root_dir = os.path.dirname(test_dir)