ftests: cleanup return statements

This patch cleans up a few oddities around return statements:
1. Removes redundant return statements across the ftests/*, mostly in
   the function prereqs and a few other places too.
2. Follows the same function template for prereqs, across the ftests/*.,
   and removes the checks for success on return from prereqs function,
   those will be true always.
3. Also, replace consts.TEST_PASSED, None with pass for functions, that
   serves as stub and remove the return value checks for stubs.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 0c65a402990d8657637b10bb4ae02f99ae575082)

diff --git a/tests/ftests/002-cgdelete-recursive_delete.py b/tests/ftests/002-cgdelete-recursive_delete.py
index 37328db0cef857000edebf3df9b9d3138ebfecaa..b51abcdcc11f9ad2b9468ce248fb9485a0e0e414 100755 (executable)
--- a/tests/ftests/002-cgdelete-recursive_delete.py
+++ b/tests/ftests/002-cgdelete-recursive_delete.py
@@ -21,7 +21,7 @@ GRANDCHILD = 'grandchildcg'
 
 def prereqs(config):
     # This test should run on both cgroup v1 and v2
-    return consts.TEST_PASSED, None
+    pass
 
 
 def setup(config):
@@ -53,10 +53,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/004-cgsnapshot-basic_snapshot_v1.py b/tests/ftests/004-cgsnapshot-basic_snapshot_v1.py
index 42d65e6853c042169a5998612bd789f265d60f54..6b6f32c11393c8a2b82778876f3dfd7d12bb7ab8 100755 (executable)
--- a/tests/ftests/004-cgsnapshot-basic_snapshot_v1.py
+++ b/tests/ftests/004-cgsnapshot-basic_snapshot_v1.py
@@ -60,7 +60,6 @@ def prereqs(config):
     if not config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test must be run within a container'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/006-cgrules-basic_cgrules_v1.py b/tests/ftests/006-cgrules-basic_cgrules_v1.py
index ea34a97d0c708d474f17ffeca5e16ca0b6c43425..b7a9b58673283827cf4dc2b1c4906b1da53a0a67 100755 (executable)
--- a/tests/ftests/006-cgrules-basic_cgrules_v1.py
+++ b/tests/ftests/006-cgrules-basic_cgrules_v1.py
@@ -40,7 +40,6 @@ def prereqs(config):
     if CgroupVersion.get_version('cpu') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 cpu controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/007-cgrules-basic_cgrules_v2.py b/tests/ftests/007-cgrules-basic_cgrules_v2.py
index ad09c304182f3d29f16bcb4b0866cdf218ada650..4216a1b66a0de75306ddeebbe66be4c114804daf 100755 (executable)
--- a/tests/ftests/007-cgrules-basic_cgrules_v2.py
+++ b/tests/ftests/007-cgrules-basic_cgrules_v2.py
@@ -36,7 +36,6 @@ def prereqs(config):
     if CgroupVersion.get_version('cpuset') != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v2 cpuset controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/008-cgget-multiple_r_flags.py b/tests/ftests/008-cgget-multiple_r_flags.py
index 7d387e3ab372ecc980a62afc1a3bd6781f7127c9..e4120824f6dbc7081f487591c32b2b65c8d77cb2 100755 (executable)
--- a/tests/ftests/008-cgget-multiple_r_flags.py
+++ b/tests/ftests/008-cgget-multiple_r_flags.py
@@ -26,10 +26,7 @@ VALUE2 = '1024000'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -90,10 +87,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/009-cgget-g_flag_controller_only.py b/tests/ftests/009-cgget-g_flag_controller_only.py
index c9344c8499768d209fcaac4eb6ee62193d9d2b34..5997307e96566b57a81137d45a10611a535d24fc 100755 (executable)
--- a/tests/ftests/009-cgget-g_flag_controller_only.py
+++ b/tests/ftests/009-cgget-g_flag_controller_only.py
@@ -123,10 +123,7 @@ EXPECTED_OUT_V2 = [
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -177,10 +174,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/010-cgget-g_flag_controller_and_cgroup.py b/tests/ftests/010-cgget-g_flag_controller_and_cgroup.py
index 9059cd4bb63d4cf71f7aa74be4107e29ff0cece6..469e3c64c5907eddcaf784f3d99c684a1656e19a 100755 (executable)
--- a/tests/ftests/010-cgget-g_flag_controller_and_cgroup.py
+++ b/tests/ftests/010-cgget-g_flag_controller_and_cgroup.py
@@ -116,10 +116,7 @@ EXPECTED_OUT_V2 = [
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -180,10 +177,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/011-cgget-r_flag_two_cgroups.py b/tests/ftests/011-cgget-r_flag_two_cgroups.py
index 128bab8d68e029957a558083ebdf03a7b49de857..e6a02defeb33247f5c159be04f2feccfb256bc6e 100755 (executable)
--- a/tests/ftests/011-cgget-r_flag_two_cgroups.py
+++ b/tests/ftests/011-cgget-r_flag_two_cgroups.py
@@ -37,10 +37,7 @@ memory.max: 2048000
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -92,10 +89,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/012-cgget-multiple_r_flags2.py b/tests/ftests/012-cgget-multiple_r_flags2.py
index 493769f9287af9331c44f22ee91130cb06a5284e..d0bd7eda97e1a1c73a277898ccc0ac5eb144148b 100755 (executable)
--- a/tests/ftests/012-cgget-multiple_r_flags2.py
+++ b/tests/ftests/012-cgget-multiple_r_flags2.py
@@ -36,10 +36,7 @@ EXPECTED_OUT = '''{}:
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -93,10 +90,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/013-cgget-multiple_g_flags.py b/tests/ftests/013-cgget-multiple_g_flags.py
index 96ba15a3459833de916a85617949a5f3fe98ff75..da0d2697181fd9dcf763d8e9e855cfcbbc60c286 100755 (executable)
--- a/tests/ftests/013-cgget-multiple_g_flags.py
+++ b/tests/ftests/013-cgget-multiple_g_flags.py
@@ -145,10 +145,7 @@ EXPECTED_OUT_V2 = [
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -211,10 +208,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/014-cgget-a_flag.py b/tests/ftests/014-cgget-a_flag.py
index 6e97820ab0e50fe6ac4759ce41428f6b49e6e6ca..145135513a5f3d94e9492e237c2b1a5f1b2a043f 100755 (executable)
--- a/tests/ftests/014-cgget-a_flag.py
+++ b/tests/ftests/014-cgget-a_flag.py
@@ -19,10 +19,7 @@ CGNAME = '014cgget'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -65,7 +62,6 @@ def test(config):
     if 'cpuset.cpus' not in out:
         result = consts.TEST_FAILED
         cause = 'Failed to find cpuset settings in output\n{}'.format(out)
-        return result, cause
 
     return result, cause
 
@@ -85,10 +81,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/015-cgget-multiline_r_flag.py b/tests/ftests/015-cgget-multiline_r_flag.py
index fc9f3c669481bedcd3b59bd9304913565ac9e3a8..388a0e10e1d6d21ccf1b5a9a4b20a653cf0edf00 100755 (executable)
--- a/tests/ftests/015-cgget-multiline_r_flag.py
+++ b/tests/ftests/015-cgget-multiline_r_flag.py
@@ -21,10 +21,7 @@ VALUE = '512'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -53,7 +50,6 @@ def test(config):
     if '\tunevictable' not in out:
         result = consts.TEST_FAILED
         cause = 'Unexpected output\n{}'.format(out)
-        return result, cause
 
     return result, cause
 
@@ -63,10 +59,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/016-cgget-invalid_options.py b/tests/ftests/016-cgget-invalid_options.py
index bd8e2ea405544d6dfcee10f48662b8bd0b473584..2fd80f6f181a5d908be58a89ca7e73b64ead535d 100755 (executable)
--- a/tests/ftests/016-cgget-invalid_options.py
+++ b/tests/ftests/016-cgget-invalid_options.py
@@ -27,7 +27,6 @@ def prereqs(config):
     if not config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test must be run within a container'
-        return result, cause
 
     return result, cause
 
@@ -189,7 +188,6 @@ def test(config):
     if 'Print parameter(s)' not in ret:
         result = consts.TEST_FAILED
         cause = '#7 Failed to print help text'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/017-cgconfig-load_file.py b/tests/ftests/017-cgconfig-load_file.py
index 53490b76bf1c01f5a9dee846c8bebab8b06d1a38..8ab58eb1c7999f6896958df1006c53b5ad430349 100755 (executable)
--- a/tests/ftests/017-cgconfig-load_file.py
+++ b/tests/ftests/017-cgconfig-load_file.py
@@ -38,7 +38,6 @@ def prereqs(config):
     if CgroupVersion.get_version('cpu') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 cpu controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/018-cgconfig-load_dir.py b/tests/ftests/018-cgconfig-load_dir.py
index fe5e1174df47ce00d5bf79ebca091f4f5111056e..4f9dfa71e8068f686ce19ec3ad0831910c18a38d 100755 (executable)
--- a/tests/ftests/018-cgconfig-load_dir.py
+++ b/tests/ftests/018-cgconfig-load_dir.py
@@ -53,7 +53,6 @@ def prereqs(config):
     if CgroupVersion.get_version('memory') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 memory controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/019-cgconfig-uidgid_dperm_fperm.py b/tests/ftests/019-cgconfig-uidgid_dperm_fperm.py
index 12758d99f820555b82961e301b81dc8e03e4558d..2d99777df90ea9038c8d92cf7833d520004c6831 100755 (executable)
--- a/tests/ftests/019-cgconfig-uidgid_dperm_fperm.py
+++ b/tests/ftests/019-cgconfig-uidgid_dperm_fperm.py
@@ -34,10 +34,7 @@ CONFIG_FILE_NAME = os.path.join(os.getcwd(), '019cgconfig.conf')
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -98,7 +95,6 @@ def test(config):
                     'Directory permissions failed.  Expected {}, received {}\n'
                     ''.format(DPERM, dperm)
                 )
-        return result, cause
 
     return result, cause
 
@@ -120,9 +116,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
+    prereqs(config)
 
     try:
         setup(config)

diff --git a/tests/ftests/020-cgconfig-tasks_perms_owner.py b/tests/ftests/020-cgconfig-tasks_perms_owner.py
index 65c1410d9c132cf6e04cee225fbd15a7b8e0800e..19ed057b19de36f9b8c291c50afc00b3246fa417 100755 (executable)
--- a/tests/ftests/020-cgconfig-tasks_perms_owner.py
+++ b/tests/ftests/020-cgconfig-tasks_perms_owner.py
@@ -39,7 +39,6 @@ def prereqs(config):
     if CgroupVersion.get_version('cpuset') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 cpuset controller'
-        return result, cause
 
     return result, cause
 
@@ -93,7 +92,6 @@ def test(config):
                     'File permissions failed.  Expected {}, received {}\n'
                     ''.format(TPERM, tperm)
                 )
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/021-cgconfig-invalid_options.py b/tests/ftests/021-cgconfig-invalid_options.py
index 09e83a96d2fb6359034f189cf024824863f1cf27..bac84ebc9ae7075b4904173ed0e31dac6e1588bd 100755 (executable)
--- a/tests/ftests/021-cgconfig-invalid_options.py
+++ b/tests/ftests/021-cgconfig-invalid_options.py
@@ -30,10 +30,7 @@ CONFIG_FILE_NAME = os.path.join(os.getcwd(), '021cgconfig.conf')
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -67,7 +64,6 @@ def test(config):
     else:
         result = consts.TEST_FAILED
         cause = 'Test case erroneously passed'
-        return result, cause
 
     return result, cause
 
@@ -77,9 +73,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
+    prereqs(config)
 
     try:
         setup(config)

diff --git a/tests/ftests/022-cgset-multiple_r_flag.py b/tests/ftests/022-cgset-multiple_r_flag.py
index 07b9527d63a6eca71b0cba48db16f2ff01b88769..6d1393079025083d52921962a1930f48d9ba6b22 100755 (executable)
--- a/tests/ftests/022-cgset-multiple_r_flag.py
+++ b/tests/ftests/022-cgset-multiple_r_flag.py
@@ -29,7 +29,6 @@ def prereqs(config):
     if CgroupVersion.get_version('memory') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 memory controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/023-cgset-copy_from.py b/tests/ftests/023-cgset-copy_from.py
index 33c4f4167d3c6634b61bcddbc5974f747edb8d2d..6fa2ff282a3db6d5cc2ce36d688196ea967e8f96 100755 (executable)
--- a/tests/ftests/023-cgset-copy_from.py
+++ b/tests/ftests/023-cgset-copy_from.py
@@ -30,7 +30,6 @@ def prereqs(config):
     if CgroupVersion.get_version('memory') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 memory controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/025-cgset-multiple_cgroups.py b/tests/ftests/025-cgset-multiple_cgroups.py
index 3c1ae63fe1ffe4ec124db3a938405dad44f8f828..dab2f72ecc161bb5d5d3e5cbc464815d4a1915d6 100755 (executable)
--- a/tests/ftests/025-cgset-multiple_cgroups.py
+++ b/tests/ftests/025-cgset-multiple_cgroups.py
@@ -28,7 +28,6 @@ def prereqs(config):
     if CgroupVersion.get_version('memory') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 memory controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/026-cgset-multiple_r_multiple_cgroup.py b/tests/ftests/026-cgset-multiple_r_multiple_cgroup.py
index fcd5d32cbd33f8dfb4d93b983327d69ba836ae42..1d60bb27df4961970af6ebaff8d1551dcc40da08 100755 (executable)
--- a/tests/ftests/026-cgset-multiple_r_multiple_cgroup.py
+++ b/tests/ftests/026-cgset-multiple_r_multiple_cgroup.py
@@ -30,7 +30,6 @@ def prereqs(config):
     if CgroupVersion.get_version('memory') != CgroupVersion.CGROUP_V1:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v1 memory controller'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/027-cgset-invalid_options.py b/tests/ftests/027-cgset-invalid_options.py
index 6bca8a69cd0297cb786d3a19afa3801eb62595b8..c284ab927eb6be13a09a46b59f6c0c76b587028a 100755 (executable)
--- a/tests/ftests/027-cgset-invalid_options.py
+++ b/tests/ftests/027-cgset-invalid_options.py
@@ -20,10 +20,7 @@ CGNAME2 = '027cgset2'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -146,7 +143,6 @@ def test(config):
     if 'Usage:' not in ret:
         result = consts.TEST_FAILED
         cause = '#6 Failed to print help text'
-        return result, cause
 
     return result, cause
 
@@ -157,10 +153,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/029-lssubsys-basic_lssubsys.py b/tests/ftests/029-lssubsys-basic_lssubsys.py
index 973f8ce54be9f3a0348bb6134df21f2bd93e77d2..756c64bb2395398dd1c9d228d4042d80c783440f 100755 (executable)
--- a/tests/ftests/029-lssubsys-basic_lssubsys.py
+++ b/tests/ftests/029-lssubsys-basic_lssubsys.py
@@ -15,10 +15,7 @@ import os
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -69,9 +66,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
+    prereqs(config)
 
     try:
         setup(config)

diff --git a/tests/ftests/030-lssubsys-lssubsys_all.py b/tests/ftests/030-lssubsys-lssubsys_all.py
index ec9a3b710ea63b3137d0030fb316735491a46ae3..c83587d83dcba5f659f6a0138586ea4525e59400 100755 (executable)
--- a/tests/ftests/030-lssubsys-lssubsys_all.py
+++ b/tests/ftests/030-lssubsys-lssubsys_all.py
@@ -15,10 +15,7 @@ import os
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -66,7 +63,6 @@ def test(config):
     if 'Usage:' not in ret:
         result = consts.TEST_FAILED
         cause = 'Failed to print help text'
-        return result, cause
 
     return result, cause
 
@@ -76,9 +72,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
+    prereqs(config)
 
     try:
         setup(config)

diff --git a/tests/ftests/031-lscgroup-g_flag.py b/tests/ftests/031-lscgroup-g_flag.py
index 23348ee610e412322464cf26d79efabce87e5d7e..334a3e996364776f99f6f12b7896eab71820b683 100755 (executable)
--- a/tests/ftests/031-lscgroup-g_flag.py
+++ b/tests/ftests/031-lscgroup-g_flag.py
@@ -52,7 +52,6 @@ def prereqs(config):
         # Skip this test because of this
         result = consts.TEST_SKIPPED
         cause = 'See Github Issue #50 - lscgroup lists controllers...'
-        return result, cause
 
     return result, cause
 
@@ -81,7 +80,6 @@ def test(config):
                     "".format(utils.indent(EXPECTED_OUT1, 4),
                               utils.indent(out, 4))
                 )
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/032-lscgroup-multiple_g_flags.py b/tests/ftests/032-lscgroup-multiple_g_flags.py
index 2502d9cdd1e99d71c60cb92caa6cc468eac57f2a..528c43d7918d4f7581b3f91b37103da50310f0c8 100755 (executable)
--- a/tests/ftests/032-lscgroup-multiple_g_flags.py
+++ b/tests/ftests/032-lscgroup-multiple_g_flags.py
@@ -57,7 +57,6 @@ def prereqs(config):
         # Skip this test because of this
         result = consts.TEST_SKIPPED
         cause = 'See Github Issue #50 - lscgroup lists controllers...'
-        return result, cause
 
     return result, cause
 
@@ -95,7 +94,6 @@ def test(config):
     if 'Usage:' not in ret:
         result = consts.TEST_FAILED
         cause = 'Failed to print help text'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/033-cgget-no_flags.py b/tests/ftests/033-cgget-no_flags.py
index d8d5e8ded0cf6ea89f44e669232bd3765c4871cb..114cdf3340bc48ef3c3b378f39efb0d117526dd2 100755 (executable)
--- a/tests/ftests/033-cgget-no_flags.py
+++ b/tests/ftests/033-cgget-no_flags.py
@@ -18,10 +18,7 @@ CGNAME = '033cgget'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -57,10 +54,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/034-cgexec-basic_cgexec.py b/tests/ftests/034-cgexec-basic_cgexec.py
index 8a099aadda3f3f70c078ba28e0f325b3b7899a7a..b3a07471f5ba25165b7776e364087ef81672d650 100755 (executable)
--- a/tests/ftests/034-cgexec-basic_cgexec.py
+++ b/tests/ftests/034-cgexec-basic_cgexec.py
@@ -20,12 +20,13 @@ CGNAME = '034cgexec'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
     if not config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test must be run within a container'
-        return result, cause
 
-    return consts.TEST_PASSED, None
+    return result, cause
 
 
 def setup(config):
@@ -33,6 +34,9 @@ def setup(config):
 
 
 def test(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     config.process.create_process_in_cgroup(config, CONTROLLER, CGNAME,
                                             cgclassify=False)
 
@@ -48,9 +52,8 @@ def test(config):
     if 'Run the task in given control group(s)' not in ret:
         result = consts.TEST_FAILED
         cause = 'Failed to print cgexec help text: {}'.format(ret)
-        return result, cause
 
-    return consts.TEST_PASSED, None
+    return result, cause
 
 
 def teardown(config):

diff --git a/tests/ftests/035-cgset-set_cgroup_type.py b/tests/ftests/035-cgset-set_cgroup_type.py
index d91fa2e4f8b13b519e35fdaefebc8e59a362ec36..42ce71d57fb4d373040bc9f3127ebf762083347b 100755 (executable)
--- a/tests/ftests/035-cgset-set_cgroup_type.py
+++ b/tests/ftests/035-cgset-set_cgroup_type.py
@@ -43,8 +43,6 @@ def setup(config):
     Cgroup.create(config, CONTROLLER, CGNAME)
     Cgroup.get_and_validate(config, CGNAME, SETTING, BEFORE)
 
-    return consts.TEST_PASSED, None
-
 
 def test(config):
     Cgroup.set_and_validate(config, CGNAME, SETTING, AFTER)
@@ -62,9 +60,6 @@ def main(config):
         return [result, cause]
 
     setup(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
     [result, cause] = test(config)
     teardown(config)
 

diff --git a/tests/ftests/036-cgset-multi_thread.py b/tests/ftests/036-cgset-multi_thread.py
index 6f76f4371ca49ca2c9cc68f69350cc921d1ef234..a736ff0b517454c97bf51b9840373cea5656caed 100755 (executable)
--- a/tests/ftests/036-cgset-multi_thread.py
+++ b/tests/ftests/036-cgset-multi_thread.py
@@ -35,7 +35,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the cgroup v2'
-        return result, cause
 
     return result, cause
 
@@ -46,8 +45,6 @@ def setup(config):
 
     Cgroup.set_and_validate(config, CHILD_CGPATH, SETTING, AFTER)
 
-    return consts.TEST_PASSED, None
-
 
 def test(config):
     config.process.create_threaded_process_in_cgroup(

diff --git a/tests/ftests/037-cgxget-cpu_settings.py b/tests/ftests/037-cgxget-cpu_settings.py
index 803290210b937770d799d46114c1d281a7f7e7b2..20871e8684bf0293e0601e8c93ee2bdd20548267 100755 (executable)
--- a/tests/ftests/037-cgxget-cpu_settings.py
+++ b/tests/ftests/037-cgxget-cpu_settings.py
@@ -54,10 +54,7 @@ TABLE = [
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -92,10 +89,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/038-cgxget-cpuset_settings.py b/tests/ftests/038-cgxget-cpuset_settings.py
index b376ecbe2c354eb17295d89b99ccec634a89f827..8af6d874e5459193da90c8a5b281b88390611f94 100755 (executable)
--- a/tests/ftests/038-cgxget-cpuset_settings.py
+++ b/tests/ftests/038-cgxget-cpuset_settings.py
@@ -80,7 +80,6 @@ def prereqs(config):
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/039-pybindings-cgxget.py b/tests/ftests/039-pybindings-cgxget.py
index 4539c3855baf24135d967cf389003fd22beec1c6..9e609e18c5ed9f6c98109beadd2a27682e7a79b6 100755 (executable)
--- a/tests/ftests/039-pybindings-cgxget.py
+++ b/tests/ftests/039-pybindings-cgxget.py
@@ -26,13 +26,12 @@ VALUE2 = '400'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
@@ -113,7 +112,6 @@ def test(config):
                     ''.format(SETTING2, VALUE2,
                               cg2.controllers[CONTROLLER].settings[SETTING2])
                 )
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/040-pybindings-cgxset.py b/tests/ftests/040-pybindings-cgxset.py
index e562093db6411b7386055314a6fc3cc7c4983e26..8e392a45db9d7cb0db0b1736286ade2474ac4a72 100755 (executable)
--- a/tests/ftests/040-pybindings-cgxset.py
+++ b/tests/ftests/040-pybindings-cgxset.py
@@ -27,13 +27,12 @@ VALUE2 = '50'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
@@ -89,7 +88,6 @@ def test(config):
     if value_v2 != VALUE2:
         result = consts.TEST_FAILED
         cause = 'Expected {}, but received {}'.format(VALUE2, value_v2)
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/041-pybindings-library_version.py b/tests/ftests/041-pybindings-library_version.py
index 1205799a26ed1ccc7c550bda245dd1811421311f..313507884d855ff0e4cfb2cc9a9a07daebfb45bf 100755 (executable)
--- a/tests/ftests/041-pybindings-library_version.py
+++ b/tests/ftests/041-pybindings-library_version.py
@@ -15,11 +15,11 @@ import os
 
 
 def prereqs(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -41,7 +41,6 @@ def test(config):
     if not isinstance(release, int):
         result = consts.TEST_FAILED
         cause = 'Release version failed. Received {}'.format(release)
-        return result, cause
 
     return result, cause
 
@@ -51,10 +50,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/042-cgxget-unmappable.py b/tests/ftests/042-cgxget-unmappable.py
index c558e925f9e2b57691e592bdbd0b01d131543650..9b865483fc5fce36ea2e50fb9046d01ea9916472 100755 (executable)
--- a/tests/ftests/042-cgxget-unmappable.py
+++ b/tests/ftests/042-cgxget-unmappable.py
@@ -19,10 +19,7 @@ SETTING = 'cpu.stat'
 
 
 def prereqs(config):
-    result = consts.TEST_PASSED
-    cause = None
-
-    return result, cause
+    pass
 
 
 def setup(config):
@@ -56,10 +53,7 @@ def teardown(config):
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/043-cgcreate-empty_controller.py b/tests/ftests/043-cgcreate-empty_controller.py
index ddb4afe0e108c5000f4cef42458084f353be63b2..bb0c487ba756b453e29a389c6ff8921627da0545 100755 (executable)
--- a/tests/ftests/043-cgcreate-empty_controller.py
+++ b/tests/ftests/043-cgcreate-empty_controller.py
@@ -31,7 +31,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -60,9 +60,6 @@ def main(config):
         return [result, cause]
 
     setup(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
     [result, cause] = test(config)
     teardown(config)
 

diff --git a/tests/ftests/045-pybindings-list_mount_points.py b/tests/ftests/045-pybindings-list_mount_points.py
index 5e51c562c41728f2e4ad726d54262548256549ef..f8a8b9ebe24afa891fa3190d5d9a00920df07e0e 100755 (executable)
--- a/tests/ftests/045-pybindings-list_mount_points.py
+++ b/tests/ftests/045-pybindings-list_mount_points.py
@@ -17,19 +17,18 @@ CGNAME = '045bindings'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -46,7 +45,7 @@ def test(config):
 
 
 def teardown(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def main(config):

diff --git a/tests/ftests/047-cgcreate-delete_cgrp_shared_mnt.py b/tests/ftests/047-cgcreate-delete_cgrp_shared_mnt.py
index 2b86dac0dc12003d1b066685ea67d2464381f95a..36971d9724f9b2fc2a49284fe158f47b8a0150fe 100755 (executable)
--- a/tests/ftests/047-cgcreate-delete_cgrp_shared_mnt.py
+++ b/tests/ftests/047-cgcreate-delete_cgrp_shared_mnt.py
@@ -66,7 +66,7 @@ def test(config):
 
 
 def teardown(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def main(config):

diff --git a/tests/ftests/048-pybindings-get_cgroup_mode.py b/tests/ftests/048-pybindings-get_cgroup_mode.py
index 024cf58dc46974a5840644ea22c4bfff8adb4f6d..1d24e92f6db646d7eead036b210d8630155bbe4d 100755 (executable)
--- a/tests/ftests/048-pybindings-get_cgroup_mode.py
+++ b/tests/ftests/048-pybindings-get_cgroup_mode.py
@@ -16,11 +16,11 @@ import os
 
 
 def prereqs(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -38,14 +38,11 @@ def test(config):
 
 
 def teardown(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def main(config):
-    [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
+    prereqs(config)
     setup(config)
     [result, cause] = test(config)
     teardown(config)

diff --git a/tests/ftests/049-sudo-systemd_create_scope.py b/tests/ftests/049-sudo-systemd_create_scope.py
index 887f88a5b0016a207f40e174a3a02f69c6d9c509..df14edc59e016205439eb3ee877f1bd009d50c82 100755 (executable)
--- a/tests/ftests/049-sudo-systemd_create_scope.py
+++ b/tests/ftests/049-sudo-systemd_create_scope.py
@@ -27,6 +27,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -35,10 +38,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 

diff --git a/tests/ftests/050-sudo-systemd_create_scope_w_pid.py b/tests/ftests/050-sudo-systemd_create_scope_w_pid.py
index 68823482b5dcd1b44f8541b8998c252bd67456d2..9759e7440d1b40cbe1ce3175a8b6522a0dc19772 100755 (executable)
--- a/tests/ftests/050-sudo-systemd_create_scope_w_pid.py
+++ b/tests/ftests/050-sudo-systemd_create_scope_w_pid.py
@@ -28,6 +28,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -36,10 +39,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 

diff --git a/tests/ftests/051-sudo-cgroup_get_cgroup.py b/tests/ftests/051-sudo-cgroup_get_cgroup.py
index 9b2725b30d8b2cd27543581c578b5a7d138cd7be..47fe1deca28f4c785e08e78ed4fc0d997b7cf60e 100755 (executable)
--- a/tests/ftests/051-sudo-cgroup_get_cgroup.py
+++ b/tests/ftests/051-sudo-cgroup_get_cgroup.py
@@ -22,6 +22,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -30,10 +33,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
@@ -67,8 +66,6 @@ def teardown(config, result):
     except RuntimeError:
         pass
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/052-sudo-cgroup_attach_task.py b/tests/ftests/052-sudo-cgroup_attach_task.py
index aa20ac3e1fe5e2b7102f79f1d46419932d6e594b..112b917ad47f8b336aad60b6210fda6d7cdb87c6 100755 (executable)
--- a/tests/ftests/052-sudo-cgroup_attach_task.py
+++ b/tests/ftests/052-sudo-cgroup_attach_task.py
@@ -23,6 +23,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -31,10 +34,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
@@ -90,8 +89,6 @@ def teardown(config, result):
     except RuntimeError:
         pass
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/053-sudo-cgroup_attach_task_pid.py b/tests/ftests/053-sudo-cgroup_attach_task_pid.py
index 563235b30e86dda7eb976c6251c7a40d2e99a06e..c873c39e10a818d20c164f2a71e59ad539fc54fc 100755 (executable)
--- a/tests/ftests/053-sudo-cgroup_attach_task_pid.py
+++ b/tests/ftests/053-sudo-cgroup_attach_task_pid.py
@@ -23,6 +23,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -31,10 +34,6 @@ def prereqs(config):
     if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 
@@ -92,8 +91,6 @@ def teardown(config, result):
     except RuntimeError:
         pass
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/054-sudo-set_uid_gid_v2.py b/tests/ftests/054-sudo-set_uid_gid_v2.py
index a3794b8aa18e14fbdb2e18941934e0a9e2b860f3..05966ce10e7e612689c3f970de9211ee178e62f4 100755 (executable)
--- a/tests/ftests/054-sudo-set_uid_gid_v2.py
+++ b/tests/ftests/054-sudo-set_uid_gid_v2.py
@@ -35,7 +35,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -67,8 +67,6 @@ def test(config):
 def teardown(config):
     CgroupCli.delete(config, None, CGNAME)
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/055-sudo-set_uid_gid_v1.py b/tests/ftests/055-sudo-set_uid_gid_v1.py
index 7bfac3a60c33ad2f8c4df9b22cf9bcdbc0574db2..7ca972e452ff9d02ca36809f2a2317f64de80f29 100755 (executable)
--- a/tests/ftests/055-sudo-set_uid_gid_v1.py
+++ b/tests/ftests/055-sudo-set_uid_gid_v1.py
@@ -35,7 +35,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -85,8 +85,6 @@ def test(config):
 def teardown(config):
     CgroupCli.delete(config, CONTROLLER, CGNAME)
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/056-sudo-set_permissions_v2.py b/tests/ftests/056-sudo-set_permissions_v2.py
index 93176f15e5ed063101b0017f201d2daa764e8b54..7ac41bac69159e601b51d39d44b243757ce64103 100755 (executable)
--- a/tests/ftests/056-sudo-set_permissions_v2.py
+++ b/tests/ftests/056-sudo-set_permissions_v2.py
@@ -38,7 +38,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -74,8 +74,6 @@ def test(config):
 def teardown(config):
     CgroupCli.delete(config, None, CGNAME)
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/057-sudo-set_permissions_v1.py b/tests/ftests/057-sudo-set_permissions_v1.py
index f87f2476ecb09da8b0e89b24068b62e925c01342..566f6a0ad10f2f2145a023e34d23979f1e5a5ef0 100755 (executable)
--- a/tests/ftests/057-sudo-set_permissions_v1.py
+++ b/tests/ftests/057-sudo-set_permissions_v1.py
@@ -38,7 +38,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def test(config):
@@ -84,8 +84,6 @@ def test(config):
 def teardown(config):
     CgroupCli.delete(config, CONTROLLER, CGNAME)
 
-    return consts.TEST_PASSED, None
-
 
 def main(config):
     [result, cause] = prereqs(config)

diff --git a/tests/ftests/058-sudo-systemd_create_scope2.py b/tests/ftests/058-sudo-systemd_create_scope2.py
index 74282770159013b30f679108aae78c07900c36ea..751a221d612cc24353df0597853439ae7ce9b926 100755 (executable)
--- a/tests/ftests/058-sudo-systemd_create_scope2.py
+++ b/tests/ftests/058-sudo-systemd_create_scope2.py
@@ -41,6 +41,9 @@ CTRL_GID = 5791
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -49,10 +52,6 @@ def prereqs(config):
     if CgroupCliVersion.get_version(CONTROLLER) != CgroupCliVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 

diff --git a/tests/ftests/059-sudo-invalid_systemd_create_scope2.py b/tests/ftests/059-sudo-invalid_systemd_create_scope2.py
index 1b40e4387779a2ddc6b767a17348fdfa55dd5179..25d2e39095bbeeb859866bb46885e13b858ba9a2 100755 (executable)
--- a/tests/ftests/059-sudo-invalid_systemd_create_scope2.py
+++ b/tests/ftests/059-sudo-invalid_systemd_create_scope2.py
@@ -20,6 +20,9 @@ CONTROLLER = 'cpu'
 
 
 def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
     if config.args.container:
         result = consts.TEST_SKIPPED
         cause = 'This test cannot be run within a container'
@@ -28,10 +31,6 @@ def prereqs(config):
     if CgroupCliVersion.get_version(CONTROLLER) != CgroupCliVersion.CGROUP_V2:
         result = consts.TEST_SKIPPED
         cause = 'This test requires cgroup v2'
-        return result, cause
-
-    result = consts.TEST_PASSED
-    cause = None
 
     return result, cause
 

diff --git a/tests/ftests/060-sudo-cgconfigparser-systemd.py b/tests/ftests/060-sudo-cgconfigparser-systemd.py
index 4f55c21f0d3980fad1f38a78931278fc3a106d8c..33f32c6a7b6ac29d50bb18c0915aa60b61afcaf0 100755 (executable)
--- a/tests/ftests/060-sudo-cgconfigparser-systemd.py
+++ b/tests/ftests/060-sudo-cgconfigparser-systemd.py
@@ -78,7 +78,7 @@ def prereqs(config):
 
 
 def setup(config):
-    return consts.TEST_PASSED, None
+    pass
 
 
 def write_conf_file(config, configurations):

diff --git a/tests/ftests/072-pybindings-cgroup_get_cgroup.py b/tests/ftests/072-pybindings-cgroup_get_cgroup.py
index 0f8d04ed82417137d6a4a8e7cbe21d48e26cf3af..d2af60b3f2e242af84b0a3fafbc32eddc16f3027 100755 (executable)
--- a/tests/ftests/072-pybindings-cgroup_get_cgroup.py
+++ b/tests/ftests/072-pybindings-cgroup_get_cgroup.py
@@ -33,7 +33,6 @@ def prereqs(config):
     if Cgroup.cgroup_mode() != Mode.CGROUP_MODE_UNIFIED:
         result = consts.TEST_SKIPPED
         cause = 'This test requires the unified cgroup v2 hierarchy'
-        return result, cause
 
     return result, cause
 

diff --git a/tests/ftests/999-stress-cgroup_init.py b/tests/ftests/999-stress-cgroup_init.py
index 0127c8692ad18ef983e3dd35012ecf604345d284..e157fb77ef1df088ce34c332537dd0d59f1a0142 100755 (executable)
--- a/tests/ftests/999-stress-cgroup_init.py
+++ b/tests/ftests/999-stress-cgroup_init.py
@@ -83,9 +83,6 @@ def teardown(config):
 
 def main(config):
     [result, cause] = prereqs(config)
-    if result != consts.TEST_PASSED:
-        return [result, cause]
-
     setup(config)
     [result, cause] = test(config)
     teardown(config)