gen_robot_plug_in.py to use set_term_options
Change-Id: Ifadc4564aa6737b3087d28906f787eb43b41ab4d
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 54e2eb4..c31b053 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -23,6 +23,7 @@
from boot_data import *
import gen_print as gp
import gen_robot_plug_in as grpi
+import gen_arg as ga
import gen_valid as gv
import gen_misc as gm
import gen_cmd as gc
@@ -975,8 +976,12 @@
def obmc_boot_test_teardown():
r"""
- Clean up after the Main keyword.
+ Clean up after the main keyword.
"""
+ gp.qprint_executing()
+
+ if ga.psutil_imported:
+ ga.terminate_descendants()
if cp_setup_called:
plug_in_setup()
@@ -1017,6 +1022,11 @@
"""
gp.qprintn()
+ gp.qprint_executing()
+
+ if ga.psutil_imported:
+ ga.terminate_descendants()
+
cmd_buf = ["Print Error",
"A keyword timeout occurred ending this program.\n"]
BuiltIn().run_keyword_if_timeout_occurred(*cmd_buf)
@@ -1082,6 +1092,8 @@
global save_stack
+ ga.set_term_options(term_requests={'pgm_names': ['process_plug_in_packages.py']})
+
gp.dprintn()
# Process function parms.
for parm_name in main_func_parm_list: