From 952c75adf3debd8b54469184988512a82053bcb0 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 4 Oct 2010 15:28:29 +0200 Subject: [PATCH] fix step names & improve logging in similar (step not found) cases --- system/TestMain.py | 2 +- system/TestPlc.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/TestMain.py b/system/TestMain.py index afdc5e5..f3d37b8 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -301,7 +301,7 @@ steps refer to a method in TestPlc or to a step_* module names.sort() all_step_infos += [ ("%s.%s"%(step,name),module_dict[name],force,cross,qualifier) for name in names ] except : - print '********** step %s NOT FOUND -- ignored'%(step) + utils.header("********** FAILED step %s (NOT FOUND) -- won't be run"%step) traceback.print_exc() overall_result = False diff --git a/system/TestPlc.py b/system/TestPlc.py index 5d802f3..90002cb 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -93,11 +93,11 @@ class TestPlc: 'reinstall_node', 'init_node','bootcd', 'configure_qemu', 'export_qemu', 'kill_all_qemus', 'start_node', SEP, 'install_sfa', 'configure_sfa', 'cross_configure_sfa', 'import_sfa', 'start_sfa', SEPSFA, 'configure_sfi@1', 'add_user_sfa@1', 'add_sfa@1', 'create_sfa@1', SEPSFA, - 'update_sfa_user@1', 'update_sfa@1', 'view_sfa@1', SEPSFA, + 'update_user_sfa@1', 'update_sfa@1', 'view_sfa@1', SEPSFA, # better use of time: do this now that the nodes are taking off 'plcsh_stress_test@1', SEP, 'nodes_ssh_debug', 'nodes_ssh_boot', 'check_slice', 'check_initscripts', SEPSFA, - 'check_slice_sfa@1', 'delete_sfa_user@1', 'delete_slice_sfa@1', SEPSFA, + 'check_slice_sfa@1', 'delete_slice_sfa@1', 'delete_user_sfa@1', SEPSFA, 'check_tcp', 'check_hooks@1', SEP, 'force_gather_logs', 'force_resources_post', SEP, ] @@ -1272,7 +1272,7 @@ class TestPlc: "run sfi.py create (on SM) for 1st-time creation" pass - def update_sfa_user(self): + def update_user_sfa(self): return TestUserSfa(self).update_user() @slice_sfa_mapper @@ -1295,13 +1295,13 @@ class TestPlc: "tries to ssh-enter the SFA slice" pass - def delete_sfa_user(self): + def delete_user_sfa(self): "run sfi.py delete (on SM) for user" test_user_sfa=TestUserSfa(self) return test_user_sfa.delete_user() @slice_sfa_mapper - def delete_sfa_slice(self): + def delete_slice_sfa(self): "run sfi.py delete (on SM), sfi.py remove (on Registry) to clean slices" pass -- 2.47.0