From: Kamalesh Babulal Date: Tue, 15 Feb 2022 07:31:44 +0000 (+0530) Subject: test-038: make it PEP8 compliant X-Git-Tag: v3.1.0~308^2~2^2~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ced32c5d5a77afa5a1f4d460bda9af22a7d0e76;p=thirdparty%2Flibcgroup.git test-038: make it PEP8 compliant Make test 038-cgxget-cpuset_settings.py PEP-8 compliant. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- diff --git a/ftests/038-cgxget-cpuset_settings.py b/ftests/038-cgxget-cpuset_settings.py index 9bee9e4d..8e59c327 100755 --- a/ftests/038-cgxget-cpuset_settings.py +++ b/ftests/038-cgxget-cpuset_settings.py @@ -21,42 +21,66 @@ # from cgroup import Cgroup, CgroupVersion +from run import Run import consts import ftests -import os -from run import Run import sys +import os CONTROLLER = 'cpuset' CGNAME = '038cgxget' +CGRP_VER_V1 = CgroupVersion.CGROUP_V1 +CGRP_VER_V2 = CgroupVersion.CGROUP_V2 + TABLE = [ # writesetting, writeval, writever, readsetting, readval, readver - ['cpuset.cpus', '0-1', CgroupVersion.CGROUP_V1, 'cpuset.cpus', '0-1', CgroupVersion.CGROUP_V1], - ['cpuset.cpus', '0-1', CgroupVersion.CGROUP_V1, 'cpuset.cpus', '0-1', CgroupVersion.CGROUP_V2], - ['cpuset.cpus', '0-1', CgroupVersion.CGROUP_V1, 'cpuset.effective_cpus', '0-1', CgroupVersion.CGROUP_V1], - ['cpuset.cpus', '0-1', CgroupVersion.CGROUP_V1, 'cpuset.cpus.effective', '0-1', CgroupVersion.CGROUP_V2], - ['cpuset.cpus', '1', CgroupVersion.CGROUP_V2, 'cpuset.cpus', '1', CgroupVersion.CGROUP_V1], - ['cpuset.cpus', '1', CgroupVersion.CGROUP_V2, 'cpuset.cpus', '1', CgroupVersion.CGROUP_V2], - - ['cpuset.mems', '0', CgroupVersion.CGROUP_V1, 'cpuset.mems', '0', CgroupVersion.CGROUP_V1], - ['cpuset.mems', '0', CgroupVersion.CGROUP_V1, 'cpuset.mems', '0', CgroupVersion.CGROUP_V2], - ['cpuset.mems', '0', CgroupVersion.CGROUP_V2, 'cpuset.mems', '0', CgroupVersion.CGROUP_V1], - ['cpuset.mems', '0', CgroupVersion.CGROUP_V2, 'cpuset.mems', '0', CgroupVersion.CGROUP_V2], - ['cpuset.mems', '0', CgroupVersion.CGROUP_V1, 'cpuset.effective_mems', '0', CgroupVersion.CGROUP_V1], - ['cpuset.mems', '0', CgroupVersion.CGROUP_V1, 'cpuset.mems.effective', '0', CgroupVersion.CGROUP_V2], - - ['cpuset.cpu_exclusive', '1', CgroupVersion.CGROUP_V1, 'cpuset.cpu_exclusive', '1', CgroupVersion.CGROUP_V1], - ['cpuset.cpu_exclusive', '1', CgroupVersion.CGROUP_V1, 'cpuset.cpus.partition', 'root', CgroupVersion.CGROUP_V2], - ['cpuset.cpu_exclusive', '0', CgroupVersion.CGROUP_V1, 'cpuset.cpu_exclusive', '0', CgroupVersion.CGROUP_V1], - ['cpuset.cpu_exclusive', '0', CgroupVersion.CGROUP_V1, 'cpuset.cpus.partition', 'member', CgroupVersion.CGROUP_V2], - - ['cpuset.cpus.partition', 'root', CgroupVersion.CGROUP_V2, 'cpuset.cpu_exclusive', '1', CgroupVersion.CGROUP_V1], - ['cpuset.cpus.partition', 'root', CgroupVersion.CGROUP_V2, 'cpuset.cpus.partition', 'root', CgroupVersion.CGROUP_V2], - ['cpuset.cpus.partition', 'member', CgroupVersion.CGROUP_V2, 'cpuset.cpu_exclusive', '0', CgroupVersion.CGROUP_V1], - ['cpuset.cpus.partition', 'member', CgroupVersion.CGROUP_V2, 'cpuset.cpus.partition', 'member', CgroupVersion.CGROUP_V2], + ['cpuset.cpus', '0-1', CGRP_VER_V1, + 'cpuset.cpus', '0-1', CGRP_VER_V1], + ['cpuset.cpus', '0-1', CGRP_VER_V1, + 'cpuset.cpus', '0-1', CGRP_VER_V2], + ['cpuset.cpus', '0-1', CGRP_VER_V1, + 'cpuset.effective_cpus', '0-1', CGRP_VER_V1], + ['cpuset.cpus', '0-1', CGRP_VER_V1, + 'cpuset.cpus.effective', '0-1', CGRP_VER_V2], + ['cpuset.cpus', '1', CGRP_VER_V2, + 'cpuset.cpus', '1', CGRP_VER_V1], + ['cpuset.cpus', '1', CGRP_VER_V2, + 'cpuset.cpus', '1', CGRP_VER_V2], + + ['cpuset.mems', '0', CGRP_VER_V1, + 'cpuset.mems', '0', CGRP_VER_V1], + ['cpuset.mems', '0', CGRP_VER_V1, + 'cpuset.mems', '0', CGRP_VER_V2], + ['cpuset.mems', '0', CGRP_VER_V2, + 'cpuset.mems', '0', CGRP_VER_V1], + ['cpuset.mems', '0', CGRP_VER_V2, + 'cpuset.mems', '0', CGRP_VER_V2], + ['cpuset.mems', '0', CGRP_VER_V1, + 'cpuset.effective_mems', '0', CGRP_VER_V1], + ['cpuset.mems', '0', CGRP_VER_V1, + 'cpuset.mems.effective', '0', CGRP_VER_V2], + + ['cpuset.cpu_exclusive', '1', CGRP_VER_V1, + 'cpuset.cpu_exclusive', '1', CGRP_VER_V1], + ['cpuset.cpu_exclusive', '1', CGRP_VER_V1, + 'cpuset.cpus.partition', 'root', CGRP_VER_V2], + ['cpuset.cpu_exclusive', '0', CGRP_VER_V1, + 'cpuset.cpu_exclusive', '0', CGRP_VER_V1], + ['cpuset.cpu_exclusive', '0', CGRP_VER_V1, + 'cpuset.cpus.partition', 'member', CGRP_VER_V2], + + ['cpuset.cpus.partition', 'root', CGRP_VER_V2, + 'cpuset.cpu_exclusive', '1', CGRP_VER_V1], + ['cpuset.cpus.partition', 'root', CGRP_VER_V2, + 'cpuset.cpus.partition', 'root', CGRP_VER_V2], + ['cpuset.cpus.partition', 'member', CGRP_VER_V2, + 'cpuset.cpu_exclusive', '0', CGRP_VER_V1], + ['cpuset.cpus.partition', 'member', CGRP_VER_V2, + 'cpuset.cpus.partition', 'member', CGRP_VER_V2], ] + def prereqs(config): result = consts.TEST_PASSED cause = None @@ -64,18 +88,20 @@ def prereqs(config): nproc = Run.run('nproc') if int(nproc) < 2: result = consts.TEST_SKIPPED - cause = "This test requires 2 or more processors" + cause = 'This test requires 2 or more processors' if config.args.container: result = consts.TEST_SKIPPED - cause = "This test cannot be run within a container" + cause = 'This test cannot be run within a container' return result, cause return result, cause + def setup(config): Cgroup.create(config, CONTROLLER, CGNAME) + def test(config): result = consts.TEST_PASSED cause = None @@ -89,15 +115,21 @@ def test(config): print_headers=False) if out != entry[4]: result = consts.TEST_FAILED - cause = "After setting {}={}, expected {}={}, but received {}={}".format( - entry[0], entry[1], entry[3], entry[4], entry[3], out) + cause = ( + 'After setting {}={}, expected {}={}, but received ' + '{}={}' + ''.format(entry[0], entry[1], entry[3], entry[4], + entry[3], out) + ) return result, cause return result, cause + def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME) + def main(config): [result, cause] = prereqs(config) if result != consts.TEST_PASSED: @@ -109,6 +141,7 @@ def main(config): return [result, cause] + if __name__ == '__main__': config = ftests.parse_args() # this test was invoked directly. run only it