9:21 p.m.
---
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
9:21 p.m.
New subject: [libvirt] [test-API][PATCH 2/2] update proxy and mapper part for "cleanup" using new reference
---
mapper.py | 19 +++++++++++++++++++
proxy.py | 11 +++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/mapper.py b/mapper.py
index affc510..f0b675a 100644
--- a/mapper.py
+++ b/mapper.py
@@ -55,3 +55,22 @@ class Mapper(object):
prev_testcases_params = testcases_params
return tripped_cases_list
+
+ def clean_package_casename_func_map(self):
+ """get testcase function maping without cleaning ones
"""
+ tripped_cases_list = []
+ for testcase in self.testcases_list:
+ tripped_case = {}
+ testcase_name = testcase.keys()[0]
+ if ":" in testcase_name:
+ casename = testcase_name.split(":")[1]
+ func = casename + "_clean"
+
+ if testcase_name == 'sleep' or testcase_name == 'clean':
+ continue
+
+ testcases_params = testcase.values()[0]
+ tripped_case[testcase_name + ":" + func] = testcases_params
+ tripped_cases_list.append(tripped_case)
+
+ return tripped_cases_list
diff --git a/proxy.py b/proxy.py
index f3664e3..aa34d9a 100644
--- a/proxy.py
+++ b/proxy.py
@@ -25,9 +25,10 @@ class Proxy(object):
def __init__(self, testcases_names):
""" Argument case_list is test case list """
self.testcases_names = testcases_names
- self.func_dict = dict()
def get_func_call_dict(self):
+ """Return running function reference dictionary
"""
+ self.func_dict = dict()
for testcase_name in self.testcases_names:
# Get programming package, casename
elements = testcase_name.split(":")
@@ -51,8 +52,14 @@ class Proxy(object):
def get_clearfunc_call_dict(self):
""" Return a clearing function reference dictionary.
"""
+ self.func_dict = dict()
for testcase_name in self.testcases_names:
# Get programming package, casename
+ elements = testcase_name.split(":")
+
+ if len(elements) == 3:
+ continue
+
package = testcase_name.split(":")[0]
casename = testcase_name.split(":")[1]
@@ -64,7 +71,7 @@ class Proxy(object):
func_ref = funcs(package, casename, func)
# Construct function call dictionary
- key = package + ":" + casename
+ key = package + ":" + casename + ":" + func
self.func_dict[key] = func_ref
return self.func_dict
--
1.7.1
2:40 a.m.
New subject: [libvirt] [test-API][PATCH 2/2] update proxy and mapper part for "cleanup" using new reference
ACK
Thanks!
Best Regards!
Wayne Sun
Redhat QE, Beijing, China
+86-10-6260-8246
----- Original Message -----
From: "Guannan Ren" <gren(a)redhat.com>
To: libvir-list(a)redhat.com
Sent: Friday, November 11, 2011 11:21:28 AM
Subject: [libvirt] [test-API][PATCH 2/2] update proxy and mapper part
for "cleanup" using new reference
---
mapper.py | 19 +++++++++++++++++++
proxy.py | 11 +++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/mapper.py b/mapper.py
index affc510..f0b675a 100644
--- a/mapper.py
+++ b/mapper.py
@@ -55,3 +55,22 @@ class Mapper(object):
prev_testcases_params = testcases_params
return tripped_cases_list
+
+ def clean_package_casename_func_map(self):
+ """get testcase function maping without cleaning ones
"""
+ tripped_cases_list = []
+ for testcase in self.testcases_list:
+ tripped_case = {}
+ testcase_name = testcase.keys()[0]
+ if ":" in testcase_name:
+ casename = testcase_name.split(":")[1]
+ func = casename + "_clean"
+
+ if testcase_name == 'sleep' or testcase_name == 'clean':
+ continue
+
+ testcases_params = testcase.values()[0]
+ tripped_case[testcase_name + ":" + func] = testcases_params
+ tripped_cases_list.append(tripped_case)
+
+ return tripped_cases_list
diff --git a/proxy.py b/proxy.py
index f3664e3..aa34d9a 100644
--- a/proxy.py
+++ b/proxy.py
@@ -25,9 +25,10 @@ class Proxy(object):
def __init__(self, testcases_names):
""" Argument case_list is test case list """
self.testcases_names = testcases_names
- self.func_dict = dict()
def get_func_call_dict(self):
+ """Return running function reference dictionary
"""
+ self.func_dict = dict()
for testcase_name in self.testcases_names:
# Get programming package, casename
elements = testcase_name.split(":")
@@ -51,8 +52,14 @@ class Proxy(object):
def get_clearfunc_call_dict(self):
""" Return a clearing function reference dictionary.
"""
+ self.func_dict = dict()
for testcase_name in self.testcases_names:
# Get programming package, casename
+ elements = testcase_name.split(":")
+
+ if len(elements) == 3:
+ continue
+
package = testcase_name.split(":")[0]
casename = testcase_name.split(":")[1]
@@ -64,7 +71,7 @@ class Proxy(object):
func_ref = funcs(package, casename, func)
# Construct function call dictionary
- key = package + ":" + casename
+ key = package + ":" + casename + ":" + func
self.func_dict[key] = func_ref
return self.func_dict
--
1.7.1
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
2:39 a.m.
New subject: [libvirt] [test-API][PATCH 1/2] update env_clear for new way of function reference
ACK
pls also push last series patch of clean work.
Thanks!
Best Regards!
Wayne Sun
Redhat QE, Beijing, China
+86-10-6260-8246
----- Original Message -----
From: "Guannan Ren" <gren(a)redhat.com>
To: libvir-list(a)redhat.com
Sent: Friday, November 11, 2011 11:21:27 AM
Subject: [libvirt] [test-API][PATCH 1/2] update env_clear for new way of function
reference
---
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
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
4757
days inactive
4760
days old
3 comments
2 participants
participants (2)
-
Guannan Ren -
Guannan Sun