mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 23:35:21 +00:00
Code Issues Releases Wiki Activity

zdtm.py: s/criu_cli/criu/

Browse Source 
In the criu_cli class there's the whole bunch of useful code which
not CLI-specific, so drop the _cli suffix.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Pavel Emelyanov
2016-08-24 16:21:27 +03:00
parent 3c54e236c7
commit 57699ee08a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/zdtm.py
View File

@@ -399,7 +399,7 @@ class zdtm_test:
env['ZDTM_THREAD_BOMB'] = "5" env['ZDTM_THREAD_BOMB'] = "5"
if not test_flag(self.__desc, 'suid'): if not test_flag(self.__desc, 'suid'):
# Numbers should match those in criu_cli # Numbers should match those in criu
env['ZDTM_UID'] = "18943" env['ZDTM_UID'] = "18943"
env['ZDTM_GID'] = "58467" env['ZDTM_GID'] = "58467"
env['ZDTM_GROUPS'] = "27495 48244" env['ZDTM_GROUPS'] = "27495 48244"
@@ -664,7 +664,7 @@ criu_bin = "../criu/criu"
join_ns_file = '/run/netns/zdtm_netns' join_ns_file = '/run/netns/zdtm_netns'
class criu_cli: class criu:
def __init__(self, opts): def __init__(self, opts):
self.__test = None self.__test = None
self.__dump_path = None self.__dump_path = None
@@ -843,7 +843,7 @@ class criu_cli:
@staticmethod @staticmethod
def check(feature): def check(feature):
return criu_cli.__criu("check", ["-v0", "--feature", feature]) == 0 return criu.__criu("check", ["-v0", "--feature", feature]) == 0
@staticmethod @staticmethod
def available(): def available():
@@ -1164,7 +1164,7 @@ def do_run_test(tname, tdesc, flavs, opts):
continue continue
flav = flavors[f](opts) flav = flavors[f](opts)
t = tclass(tname, tdesc, flav, fcg) t = tclass(tname, tdesc, flav, fcg)
cr_api = criu_cli(opts) cr_api = criu(opts)
try: try:
t.start() t.start()
@@ -1391,7 +1391,7 @@ def run_tests(opts):
features = {} features = {}
if opts['pre'] or opts['snaps']: if opts['pre'] or opts['snaps']:
if not criu_cli.check("mem_dirty_track"): if not criu.check("mem_dirty_track"):
print "Tracking memory is not available" print "Tracking memory is not available"
return return
@@ -1461,7 +1461,7 @@ def run_tests(opts):
if feat: if feat:
if feat not in features: if feat not in features:
print "Checking feature %s" % feat print "Checking feature %s" % feat
features[feat] = criu_cli.check(feat) features[feat] = criu.check(feat)
if not features[feat]: if not features[feat]:
l.skip(t, "no %s feature" % feat) l.skip(t, "no %s feature" % feat)
@@ -1490,7 +1490,7 @@ def run_tests(opts):
run_flavs = set(test_flavs) & set(opts_flavs) run_flavs = set(test_flavs) & set(opts_flavs)
else: else:
run_flavs = set([test_flavs.pop()]) run_flavs = set([test_flavs.pop()])
if not criu_cli.check("userns"): if not criu.check("userns"):
run_flavs -= set(['uns']) run_flavs -= set(['uns'])
if opts['user']: if opts['user']:
# FIXME -- probably uns will make sense # FIXME -- probably uns will make sense
@@ -1733,7 +1733,7 @@ if opts.get('sat', False):
if opts['debug']: if opts['debug']:
sys.settrace(traceit) sys.settrace(traceit)
criu_cli.available() criu.available()
for tst in test_classes.values(): for tst in test_classes.values():
tst.available() tst.available()