[2/3] zdtm.py: Substract criu_cli from criu

Submitted by Pavel Emelianov on Aug. 24, 2016, 1:21 p.m.

Details

Message ID 57BD9F73.5070705@virtuozzo.com
State Superseded
Commit 0a5069c68c0137ec93da10f906bb23b1e88daa38
Headers show

Commit Message

Pavel Emelianov Aug. 24, 2016, 1:21 p.m.
Now we have a single place that is really about calling criu
as CLI tool inside this class, so pull one out as a preparation
to having RPC support.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 test/zdtm.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Patch hide | download patch | download mbox

diff --git a/test/zdtm.py b/test/zdtm.py
index 0a1aa29..762551f 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -638,6 +638,18 @@  criu_bin = "../criu/criu"
 join_ns_file = '/run/netns/zdtm_netns'
 
 
+class criu_cli:
+	@staticmethod
+	def run(action, args, fault = None, strace = [], preexec = None):
+		env = None
+		if fault:
+			print "Forcing %s fault" % fault
+			env = dict(os.environ, CRIU_FAULT = fault)
+		cr = subprocess.Popen(strace + [criu_bin, action] + args, env = env, preexec_fn = preexec)
+		if action == "lazy-pages":
+			return cr
+		return cr.wait()
+
 class criu:
 	def __init__(self, opts):
 		self.__test = None
@@ -680,17 +692,6 @@  class criu:
 	def __ddir(self):
 		return os.path.join(self.__dump_path, "%d" % self.__iter)
 
-	@staticmethod
-	def __criu(action, args, fault = None, strace = [], preexec = None):
-		env = None
-		if fault:
-			print "Forcing %s fault" % fault
-			env = dict(os.environ, CRIU_FAULT = fault)
-		cr = subprocess.Popen(strace + [criu_bin, action] + args, env = env, preexec_fn = preexec)
-		if action == "lazy-pages":
-			return cr
-		return cr.wait()
-
 	def set_user_id(self):
 		# Numbers should match those in zdtm_test
 		os.setresgid(58467, 58467, 58467)
@@ -725,7 +726,7 @@  class criu:
 
 		__ddir = self.__ddir()
 
-		ret = self.__criu(action, s_args, self.__fault, strace, preexec)
+		ret = criu_cli.run(action, s_args, self.__fault, strace, preexec)
 		if action == "lazy-pages":
 			return ret
 		grep_errors(os.path.join(__ddir, log))
@@ -742,7 +743,7 @@  class criu:
 					os.rename(os.path.join(__ddir, log), os.path.join(__ddir, log + ".fail"))
 				# try again without faults
 				print "Run criu " + action
-				ret = self.__criu(action, s_args, False, strace, preexec)
+				ret = criu_cli.run(action, s_args, False, strace, preexec)
 				grep_errors(os.path.join(__ddir, log))
 				if ret == 0:
 					return
@@ -820,7 +821,7 @@  class criu:
 
 	@staticmethod
 	def check(feature):
-		return criu.__criu("check", ["-v0", "--feature", feature]) == 0
+		return criu_cli.run("check", ["-v0", "--feature", feature]) == 0
 
 	@staticmethod
 	def available():