From: Tom Hromatka Date: Fri, 21 Jan 2022 22:19:30 +0000 (+0000) Subject: ftests: Utilize the new Cgroup validate functions X-Git-Tag: v3.1.0~308^2~2^2~109^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329a94c537e51dfe3f6d0de7f6561be92c116c8c;p=thirdparty%2Flibcgroup.git ftests: Utilize the new Cgroup validate functions Replace the boilerplate copy/paste code of get, compare, and fail-on-error with calls to Cgroup.get_and_validate() and Cgroup.set_and_validate(). This is purely a cleanup commit and is nonfunctional. Signed-off-by: Tom Hromatka Reviewed-by: Kamalesh Babulal --- diff --git a/ftests/001-cgget-basic_cgget_v1.py b/ftests/001-cgget-basic_cgget_v1.py index 1c1016b1..1093c492 100755 --- a/ftests/001-cgget-basic_cgget_v1.py +++ b/ftests/001-cgget-basic_cgget_v1.py @@ -47,18 +47,9 @@ def setup(config): Cgroup.set(config, CGNAME, SETTING, VALUE) def test(config): - result = consts.TEST_PASSED - cause = None - - value = Cgroup.get(config, controller=None, cgname=CGNAME, - setting=SETTING, print_headers=False, - values_only=True) + Cgroup.get_and_validate(config, CGNAME, SETTING, VALUE) - if value != VALUE: - result = consts.TEST_FAILED - cause = "cgget expected {} but received {}".format(VALUE, value) - - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME) diff --git a/ftests/003-cgget-basic_cgget_v2.py b/ftests/003-cgget-basic_cgget_v2.py index 54727fe5..9b1ecd23 100755 --- a/ftests/003-cgget-basic_cgget_v2.py +++ b/ftests/003-cgget-basic_cgget_v2.py @@ -47,18 +47,9 @@ def setup(config): Cgroup.set(config, CGNAME, SETTING, VALUE) def test(config): - result = consts.TEST_PASSED - cause = None - - value = Cgroup.get(config, controller=None, cgname=CGNAME, - setting=SETTING, print_headers=False, - values_only=True) + Cgroup.get_and_validate(config, CGNAME, SETTING, VALUE) - if value != VALUE: - result = consts.TEST_FAILED - cause = "cgget expected {} but received {}".format(VALUE, value) - - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME) diff --git a/ftests/017-cgconfig-load_file.py b/ftests/017-cgconfig-load_file.py index da7498f2..40831995 100755 --- a/ftests/017-cgconfig-load_file.py +++ b/ftests/017-cgconfig-load_file.py @@ -60,36 +60,13 @@ def setup(config): f.close() def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.configparser(config, load_file=CONFIG_FILE_NAME) - period = Cgroup.get(config, cgname=CGNAME, setting='cpu.cfs_period_us', - print_headers=False, values_only=True) - if period != CFS_PERIOD: - result = consts.TEST_FAILED - cause = "cfs_period_us failed. Expected {}, Received {}".format( - CFS_PERIOD, period) - return result, cause - - quota = Cgroup.get(config, cgname=CGNAME, setting='cpu.cfs_quota_us', - print_headers=False, values_only=True) - if quota != CFS_QUOTA: - result = consts.TEST_FAILED - cause = "cfs_quota_us failed. Expected {}, Received {}".format( - CFS_QUOTA, quota) - return result, cause - - shares = Cgroup.get(config, cgname=CGNAME, setting='cpu.shares', - print_headers=False, values_only=True) - if shares != SHARES: - result = consts.TEST_FAILED - cause = "shares failed. Expected {}, Received {}".format( - SHARES, shares) - return result, cause + Cgroup.get_and_validate(config, CGNAME, 'cpu.cfs_period_us', CFS_PERIOD) + Cgroup.get_and_validate(config, CGNAME, 'cpu.cfs_quota_us', CFS_QUOTA) + Cgroup.get_and_validate(config, CGNAME, 'cpu.shares', SHARES) - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME) diff --git a/ftests/018-cgconfig-load_dir.py b/ftests/018-cgconfig-load_dir.py index c97bad96..5726a02f 100755 --- a/ftests/018-cgconfig-load_dir.py +++ b/ftests/018-cgconfig-load_dir.py @@ -77,53 +77,16 @@ def setup(config): f.close() def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.configparser(config, load_dir=CONFIG_FILE_DIR) - period = Cgroup.get(config, cgname=CGNAME, setting='cpu.cfs_period_us', - print_headers=False, values_only=True) - if period != CFS_PERIOD: - result = consts.TEST_FAILED - cause = "cfs_period_us failed. Expected {}, Received {}".format( - CFS_PERIOD, period) - return result, cause - - quota = Cgroup.get(config, cgname=CGNAME, setting='cpu.cfs_quota_us', - print_headers=False, values_only=True) - if quota != CFS_QUOTA: - result = consts.TEST_FAILED - cause = "cfs_quota_us failed. Expected {}, Received {}".format( - CFS_QUOTA, quota) - return result, cause - - shares = Cgroup.get(config, cgname=CGNAME, setting='cpu.shares', - print_headers=False, values_only=True) - if shares != SHARES: - result = consts.TEST_FAILED - cause = "shares failed. Expected {}, Received {}".format( - SHARES, shares) - return result, cause - - limit = Cgroup.get(config, cgname=CGNAME, setting='memory.limit_in_bytes', - print_headers=False, values_only=True) - if limit != LIMIT_IN_BYTES: - result = consts.TEST_FAILED - cause = "limit_in_bytes failed. Expected {}, Received {}".format( - LIMIT_IN_BYTES, limit) - return result, cause - - soft_limit = Cgroup.get(config, cgname=CGNAME, - setting='memory.soft_limit_in_bytes', - print_headers=False, values_only=True) - if soft_limit != SOFT_LIMIT_IN_BYTES: - result = consts.TEST_FAILED - cause = "soft_limit_in_bytes failed. Expected {}, Received {}".format( - SOFT_LIMIT_IN_BYTES, soft_limit) - return result, cause + Cgroup.get_and_validate(config, CGNAME, 'cpu.cfs_period_us', CFS_PERIOD) + Cgroup.get_and_validate(config, CGNAME, 'cpu.cfs_quota_us', CFS_QUOTA) + Cgroup.get_and_validate(config, CGNAME, 'cpu.shares', SHARES) + Cgroup.get_and_validate(config, CGNAME, 'memory.limit_in_bytes', LIMIT_IN_BYTES) + Cgroup.get_and_validate(config, CGNAME, 'memory.soft_limit_in_bytes', + SOFT_LIMIT_IN_BYTES) - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CPU_CTRL, CGNAME) diff --git a/ftests/022-cgset-multiple_r_flag.py b/ftests/022-cgset-multiple_r_flag.py index 7ab71ec2..eb9202e3 100755 --- a/ftests/022-cgset-multiple_r_flag.py +++ b/ftests/022-cgset-multiple_r_flag.py @@ -49,22 +49,12 @@ def setup(config): Cgroup.create(config, CONTROLLER, CGNAME) def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.set(config, cgname=CGNAME, setting=SETTINGS, value=VALUES) for i, setting in enumerate(SETTINGS): - value = Cgroup.get(config, cgname=CGNAME, setting=setting, - print_headers=False, values_only=True) + Cgroup.get_and_validate(config, CGNAME, setting, VALUES[i]) - if value != VALUES[i]: - result = consts.TEST_FAILED - cause = "Expected {} to be set to {}, but received {}".format( - setting, VALUES[i], value) - return result, cause - - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME) diff --git a/ftests/023-cgset-copy_from.py b/ftests/023-cgset-copy_from.py index 03c9b6d8..e34e7f02 100755 --- a/ftests/023-cgset-copy_from.py +++ b/ftests/023-cgset-copy_from.py @@ -52,22 +52,12 @@ def setup(config): Cgroup.set(config, cgname=SRC_CGNAME, setting=SETTINGS, value=VALUES) def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.set(config, cgname=DST_CGNAME, copy_from=SRC_CGNAME) for i, setting in enumerate(SETTINGS): - value = Cgroup.get(config, cgname=DST_CGNAME, setting=setting, - print_headers=False, values_only=True) + Cgroup.get_and_validate(config, DST_CGNAME, setting, VALUES[i]) - if value != VALUES[i]: - result = consts.TEST_FAILED - cause = "Expected {} to be set to {}, but received {}".format( - setting, VALUES[i], value) - return result, cause - - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, SRC_CGNAME) diff --git a/ftests/025-cgset-multiple_cgroups.py b/ftests/025-cgset-multiple_cgroups.py index 4742bb6c..a11f560f 100755 --- a/ftests/025-cgset-multiple_cgroups.py +++ b/ftests/025-cgset-multiple_cgroups.py @@ -49,28 +49,12 @@ def setup(config): Cgroup.create(config, CONTROLLER, CGNAME2) def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.set(config, cgname=[CGNAME1, CGNAME2], setting=SETTING, value=VALUE) - value = Cgroup.get(config, cgname=CGNAME1, setting=SETTING, - print_headers=False, values_only=True) - if value != VALUE: - result = consts.TEST_FAILED - cause = "Expected {} to be set to {} in {}, but received {}".format( - SETTING, VALUE, CGNAME1, value) - return result, cause - - value = Cgroup.get(config, cgname=CGNAME2, setting=SETTING, - print_headers=False, values_only=True) - if value != VALUE: - result = consts.TEST_FAILED - cause = "Expected {} to be set to {} in {}, but received {}".format( - SETTING, VALUE, CGNAME2, value) - return result, cause + Cgroup.get_and_validate(config, CGNAME1, SETTING, VALUE) + Cgroup.get_and_validate(config, CGNAME2, SETTING, VALUE) - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME1) diff --git a/ftests/026-cgset-multiple_r_multiple_cgroup.py b/ftests/026-cgset-multiple_r_multiple_cgroup.py index 3681775f..8c194001 100755 --- a/ftests/026-cgset-multiple_r_multiple_cgroup.py +++ b/ftests/026-cgset-multiple_r_multiple_cgroup.py @@ -51,23 +51,13 @@ def setup(config): Cgroup.create(config, CONTROLLER, cg) def test(config): - result = consts.TEST_PASSED - cause = None - Cgroup.set(config, cgname=CGNAMES, setting=SETTINGS, value=VALUES) for i, setting in enumerate(SETTINGS): for cg in CGNAMES: - value = Cgroup.get(config, cgname=cg, setting=setting, - print_headers=False, values_only=True) + Cgroup.get_and_validate(config, cg, setting, VALUES[i]) - if value != VALUES[i]: - result = consts.TEST_FAILED - cause = "Expected {} to be set to {} in {}, but received {}".format( - setting, VALUES[i], cg, value) - return result, cause - - return result, cause + return consts.TEST_PASSED, None def teardown(config): for cg in CGNAMES: diff --git a/ftests/035-cgset-set_cgroup_type.py b/ftests/035-cgset-set_cgroup_type.py index 70159502..4a32d3bf 100755 --- a/ftests/035-cgset-set_cgroup_type.py +++ b/ftests/035-cgset-set_cgroup_type.py @@ -51,37 +51,15 @@ def prereqs(config): return result, cause def setup(config): - result = consts.TEST_PASSED - cause = None - Cgroup.create(config, CONTROLLER, CGNAME) + Cgroup.get_and_validate(config, CGNAME, SETTING, BEFORE) - - before = Cgroup.get(config, controller=None, cgname=CGNAME, - setting=SETTING, print_headers=False, - values_only=True) - if before != BEFORE: - result = consts.TEST_SKIPPED - cause = "Skipping test. Unexpected value in {}: {}".format(SETTING, - before) - - return result, cause + return consts.TEST_PASSED, None def test(config): - result = consts.TEST_PASSED - cause = None - - Cgroup.set(config, CGNAME, SETTING, AFTER) + Cgroup.set_and_validate(config, CGNAME, SETTING, AFTER) - after = Cgroup.get(config, controller=None, cgname=CGNAME, - setting=SETTING, print_headers=False, - values_only=True) - - if after != AFTER: - result = consts.TEST_FAILED - cause = "cgget expected {} but received {}".format(AFTER, after) - - return result, cause + return consts.TEST_PASSED, None def teardown(config): Cgroup.delete(config, CONTROLLER, CGNAME)