summaryrefslogtreecommitdiffstats
path: root/doctor_tests
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2018-02-28 12:05:26 +0200
committerRyota Mibu <r-mibu@cq.jp.nec.com>2018-03-07 06:48:02 +0000
commit9779a91a2eb0ae7745552d30af1accbfe7a70ca0 (patch)
tree516122a537373ac430f630f118fcb8a1bd90a76c /doctor_tests
parent2889f8cc9c54b53e2e39a268ff83474ce352239b (diff)
Removing temporary process group solution.
Introducing root cause fix for sample inspector shutdown JIRA: DOCTOR-123 Change-Id: Ibc95d482f476b60584c224d8e2757d071149d611 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
Diffstat (limited to 'doctor_tests')
-rw-r--r--doctor_tests/inspector/sample.py2
-rw-r--r--doctor_tests/main.py7
2 files changed, 1 insertions, 8 deletions
diff --git a/doctor_tests/inspector/sample.py b/doctor_tests/inspector/sample.py
index fadfd3d..abc4fc6 100644
--- a/doctor_tests/inspector/sample.py
+++ b/doctor_tests/inspector/sample.py
@@ -168,7 +168,7 @@ class InspectorApp(Thread):
self.inspector.handle_events(events)
return "OK"
- @app.route('/shutdown', methods=['POST'])
+ @app.route('/events/shutdown', methods=['POST'])
def shutdown():
self.log.info('shutdown inspector app server at %s' % time.time())
func = request.environ.get('werkzeug.server.shutdown')
diff --git a/doctor_tests/main.py b/doctor_tests/main.py
index 8051ad6..3f54fc3 100644
--- 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
@@ -258,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)