[libvirt] [test-API][PATCH 1/2] update env_clear for new way of function reference

Guannan Ren gren at redhat.com
Fri Nov 11 03:21:27 UTC 2011


---
 env_clear.py |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/env_clear.py b/env_clear.py
index 302ff62..5e78ab5 100644
--- a/env_clear.py
+++ b/env_clear.py
@@ -14,7 +14,7 @@
 # distribution and at <http://www.gnu.org/licenses>.
 #
 # This module matches the reference of clearing function from each testcase
-# to the corresponding testcase's argument in the order of testcase running 
+# to the corresponding testcase's argument in the order of testcase running
 #
 
 import mapper
@@ -28,17 +28,17 @@ class EnvClear(object):
         self.cases_clearfunc_ref_dict = cases_clearfunc_ref_dict
         self.logfile = logfile
         self.loglevel = loglevel
-  
+
         mapper_obj = mapper.Mapper(activity)
-        pkg_tripped_cases = mapper_obj.get_package_tripped()
+        clean_pkg_casename_func = mapper_obj.clean_package_casename_func_map()
 
         self.cases_ref_names = []
-        for case in pkg_tripped_cases:
+        for case in clean_pkg_casename_func:
             case_ref_name = case.keys()[0]
             self.cases_ref_names.append(case_ref_name)
 
         self.cases_params_list = []
-        for case in pkg_tripped_cases:
+        for case in clean_pkg_casename_func:
             case_params = case.values()[0]
             self.cases_params_list.append(case_params)
 
@@ -48,10 +48,10 @@ class EnvClear(object):
 
     def env_clear(self):
         """ Run each clearing function with the corresponding arguments """
- 
+
         envlog = log.EnvLog(self.logfile, self.loglevel)
         logger = envlog.env_log()
-        
+
         testcase_number = len(self.cases_ref_names)
 
         for i in range(testcase_number):
@@ -59,12 +59,9 @@ class EnvClear(object):
             case_ref_name = self.cases_ref_names[i]
             case_params = self.cases_params_list[i]
 
-            if case_ref_name == 'sleep':
-                continue
-            else:
-                case_params['logger'] = logger
-                self.cases_clearfunc_ref_dict[case_ref_name](case_params)
+            case_params['logger'] = logger
+            self.cases_clearfunc_ref_dict[case_ref_name](case_params)
 
         del envlog
 
-        return 0 
+        return 0
-- 
1.7.1




More information about the libvir-list mailing list