[CRIU] [PATCH] zdtm.py: change format of test description in TAP report

Sergey Bronnikov sergeyb at openvz.org
Wed Mar 16 08:01:38 PDT 2016


changed per request from Andrey Vagin

Signed-off-by: Sergey Bronnikov <sergeyb at openvz.org>
---
 test/zdtm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 5c2d0fb..a1611cc 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1036,7 +1036,7 @@ class launcher:
 		self.__nr += 1
 		self.__runtest += 1
 		if self.__file_report:
-			testline = "ok %d - %s # SKIP %s" % (self.__runtest, name.split('/')[-1:][0], reason)
+			testline = "ok %d - %s # SKIP %s" % (self.__runtest, name, reason)
 			print >> self.__file_report, testline
 
 	def run_test(self, name, desc, flavor):
@@ -1078,7 +1078,7 @@ class launcher:
 			if status != 0:
 				failed_flavor = decode_flav(os.WEXITSTATUS(status))
 				if self.__file_report:
-					testline = "not ok %d - %s # flavor %s" % (self.__runtest, sub['name'].split('/')[-1:][0], failed_flavor)
+					testline = "not ok %d - %s # flavor %s" % (self.__runtest, sub['name'], failed_flavor)
 					print >> self.__file_report, testline
 				if not opts['keep_going']:
 					self.__fail = True
@@ -1086,7 +1086,7 @@ class launcher:
 					add_to_report(sub['log'], sub['name'].replace('/', '_') + "_" + failed_flavor + "/output")
 			else:
 				if self.__file_report:
-					testline = "ok %d - %s" % (self.__runtest, sub['name'].split('/')[-1:][0])
+					testline = "ok %d - %s" % (self.__runtest, sub['name'])
 					print >> self.__file_report, testline
 
 			if sub['log']:
-- 
2.5.0


-- 
sergeyb@


More information about the CRIU mailing list