mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

zdtm.py: Split per-test options into C and R ones

Browse Source 
One for checkpoint another for restore.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-10-12 21:53:13 +03:00
parent 56eea20c2e
commit 5193fa4a96
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/zdtm.py
View File

@@ -247,7 +247,7 @@ class zdtm_test:
def getname(self):
return self.__name
def getcropts(self):
def __getcropts(self):
opts = self.__desc.get('opts', '').split() + ["--pidfile", os.path.realpath(self.__pidfile())]
if self.__flavor.ns:
opts += ["--root", self.__flavor.root]
@@ -255,6 +255,12 @@ class zdtm_test:
opts += ["-L", os.path.dirname(os.path.realpath(self.__name)) + '/lib']
return opts
def getdopts(self):
return self.__getcropts()
def getropts(self):
return self.__getcropts()
def gone(self, force = True):
if not self.auto_reap:
pid, status = os.waitpid(int(self.__pid), 0)
@@ -317,9 +323,6 @@ class criu_cli:
grep_errors(os.path.join(self.__ddir(), log))
raise test_fail_exc("CRIU %s" % action)
def __criu_cr(self, action, opts):
self.__criu_act(action, opts = opts + self.__test.getcropts())
def dump(self, action, opts = []):
self.__iter += 1
os.mkdir(self.__ddir())
@@ -334,7 +337,9 @@ class criu_cli:
"--daemon", "--pidfile", "ps.pid"])
a_opts += ["--page-server", "--address", "127.0.0.1", "--port", "12345"]
self.__criu_cr(action, opts = a_opts + opts)
a_opts += self.__test.getdopts()
self.__criu_act(action, opts = a_opts + opts)
if self.__page_server:
wait_pid_die(int(rpidfile(self.__ddir() + "/ps.pid")), "page server")
@@ -344,7 +349,9 @@ class criu_cli:
if self.__restore_sibling:
r_opts = ["--restore-sibling"]
self.__test.auto_reap = False
self.__criu_cr("restore", opts = r_opts + ["--restore-detached"])
r_opts += self.__test.getropts()
self.__criu_act("restore", opts = r_opts + ["--restore-detached"])
@staticmethod
def check(feature):