[libvirt] [test-API PATCH 5/5] function and variable name improvement

[Guannan Ren]

    *env_clear.py
    *utils/format.py we use 2 for skip flag
---
 env_clear.py    |   26 +++++++++++++-------------
 utils/format.py |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/env_clear.py b/env_clear.py
index 2e5bcf5..a5dc4fa 100644
--- a/env_clear.py
+++ b/env_clear.py
@@ -30,17 +30,17 @@ class EnvClear(object):
         self.loglevel = loglevel
 
         mapper_obj = mapper.Mapper(activity)
-        clean_pkg_casename_func = mapper_obj.module_casename_cleanfunc_map()
+        mod_casename_func = mapper_obj.module_casename_func_noflag()
 
-        self.cases_ref_names = []
-        for case in clean_pkg_casename_func:
-            case_ref_name = case.keys()[0]
-            self.cases_ref_names.append(case_ref_name)
+        self.case_name_list = []
+        for case in mod_casename_func:
+            mod_case_func = case.keys()[0]
+            self.case_name_list.append(mod_case_func)
 
-        self.cases_params_list = []
-        for case in clean_pkg_casename_func:
+        self.case_params_list = []
+        for case in mod_casename_func:
             case_params = case.values()[0]
-            self.cases_params_list.append(case_params)
+            self.case_params_list.append(case_params)
 
     def __call__(self):
         retflag = self.env_clear()
@@ -52,15 +52,15 @@ class EnvClear(object):
         envlog = log.EnvLog(self.logfile, self.loglevel)
         logger = envlog.env_log()
 
-        testcase_number = len(self.cases_ref_names)
+        testcase_number = len(self.case_name_list)
 
         for i in range(testcase_number):
 
-            case_ref_name = self.cases_ref_names[i]
-            case_params = self.cases_params_list[i]
+            mod_case_func = self.case_name_list[i]
+            case_params = self.case_params_list[i]
 
             case_params['logger'] = logger
-            if self.cases_clearfunc_ref_dict.has_key(case_ref_name):
-                self.cases_clearfunc_ref_dict[case_ref_name](case_params)
+            if self.cases_clearfunc_ref_dict.has_key(mod_case_func):
+                self.cases_clearfunc_ref_dict[mod_case_func](case_params)
 
         return 0
diff --git a/utils/format.py b/utils/format.py
index 7ee5eca..9f228c4 100644
--- a/utils/format.py
+++ b/utils/format.py
@@ -57,7 +57,7 @@ class Format(object):
         if flag == 1:
             result = 'FAIL'
             console_result = '\033[1;31mFAIL\033[1;m'
-        if flag == 100:
+        if flag == 2:
             result = 'Skip'
             console_result = '\033[1;38mSkip\033[1;m'
 
-- 
1.7.7.5