RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mcstrans: convert test scripts to Python 3 

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2018-12-15 19:14:54 +01:00 committed by Petr Lautrbach
parent 5013d2ba97
commit 0ec2ed57c3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mcstrans/share/util/mlscolor-test
View File

@ -20,17 +20,17 @@ for arg in sys.argv[1:]:
context, expected = line.split("=") context, expected = line.split("=")
rc, raw = selinux_trans_to_raw_context(context) rc, raw = selinux_trans_to_raw_context(context)
if rc < 0: if rc < 0:
print "Unable to get raw context of '%s'" % (context) print("Unable to get raw context of '%s'" % (context))
errors += 1 errors += 1
continue continue
rc, colors = selinux_raw_context_to_color(raw) rc, colors = selinux_raw_context_to_color(raw)
if rc < 0: if rc < 0:
print "Unable to get colors for '%s'" % (context) print("Unable to get colors for '%s'" % (context))
errors += 1 errors += 1
continue continue
colors = colors.rstrip() colors = colors.rstrip()
if colors != expected: if colors != expected:
print "For '%s' got\n\t'%s' expected\n\t'%s'" % (context, colors, expected) print("For '%s' got\n\t'%s' expected\n\t'%s'" % (context, colors, expected))
errors += 1 errors += 1
continue continue
f.close() f.close()
@ -38,6 +38,6 @@ for arg in sys.argv[1:]:
s = "s" s = "s"
if errors == 1: if errors == 1:
s = "" s = ""
print "mlscolor-test done with %d error%s" % (errors, s) print("mlscolor-test done with %d error%s" % (errors, s))
sys.exit(errors) sys.exit(errors)

11
mcstrans/share/util/mlstrans-test
View File

@ -10,22 +10,22 @@ def untrans(trans, val):
global errors, verbose global errors, verbose
(rc, raw) = selinux_trans_to_raw_context(trans) (rc, raw) = selinux_trans_to_raw_context(trans)
if raw != val: if raw != val:
print "untrans: '%s' -> '%s' != '%s' FAILED" % (trans, raw, val) print("untrans: '%s' -> '%s' != '%s' FAILED" % (trans, raw, val))
errors += 1 errors += 1
else: else:
if verbose: if verbose:
print "untrans: %s -> %s != %s SUCCESS" % (trans, raw, val) print("untrans: %s -> %s != %s SUCCESS" % (trans, raw, val))
def trans(raw, val): def trans(raw, val):
global errors, verbose global errors, verbose
(rc, trans) = selinux_raw_to_trans_context(raw) (rc, trans) = selinux_raw_to_trans_context(raw)
if trans != val: if trans != val:
print "trans: '%s' -> '%s' != '%s' FAILED" % (raw, trans, val) print("trans: '%s' -> '%s' != '%s' FAILED" % (raw, trans, val))
errors += 1 errors += 1
else: else:
if verbose: if verbose:
print "trans: %s -> %s != %s SUCCESS" % (raw, trans, val) print("trans: %s -> %s != %s SUCCESS" % (raw, trans, val))
if len(sys.argv) > 1 and sys.argv[1] == "-v": if len(sys.argv) > 1 and sys.argv[1] == "-v":
verbose = 1 verbose = 1
@ -38,7 +38,6 @@ for arg in sys.argv[1:]:
if not line.strip(): if not line.strip():
continue continue
line = line.rstrip('\n') line = line.rstrip('\n')
# print line
if (line.find("==") != -1): if (line.find("==") != -1):
t, r = line.split("==") t, r = line.split("==")
untrans("a:b:c:" + t, "a:b:c:" + r) untrans("a:b:c:" + t, "a:b:c:" + r)
@ -51,6 +50,6 @@ for arg in sys.argv[1:]:
s = "s" s = "s"
if errors == 1: if errors == 1:
s = "" s = ""
print "mlstrans-test done with %d error%s" % (errors, s) print("mlstrans-test done with %d error%s" % (errors, s))
sys.exit(errors) sys.exit(errors)