Rename test 1 from 001-cgget-basic_cgget.py to
001-cgget-basic_cgget_v1.py. Also add logic to the test
to skip it on a v2 system.
Signed-off-by: Tom Hromatka <tom.hroma...@oracle.com>
---
...basic_cgget.py => 001-cgget-basic_cgget_v1.py} | 15 +++++++++++++++
ftests/Makefile.am | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
rename ftests/{001-cgget-basic_cgget.py => 001-cgget-basic_cgget_v1.py} (81%)
diff --git a/ftests/001-cgget-basic_cgget.py
b/ftests/001-cgget-basic_cgget_v1.py
similarity index 81%
rename from ftests/001-cgget-basic_cgget.py
rename to ftests/001-cgget-basic_cgget_v1.py
index c8cd3fd68a7f..87da4bc67725 100755
--- a/ftests/001-cgget-basic_cgget.py
+++ b/ftests/001-cgget-basic_cgget_v1.py
@@ -32,6 +32,17 @@ CGNAME="001cgget"
SETTING='cpu.shares'
VALUE='512'
+def prereqs(config):
+ result = consts.TEST_PASSED
+ cause = None
+
+ # This test was written for a cgroup v1 cpu controller only
+ if Cgroup.version('cpu') != Cgroup.CGROUP_V1:
+ result = consts.TEST_SKIPPED
+ cause = "This test requires the cgroup v1 cpu controller"
+
+ return result, cause
+
def setup(config):
Cgroup.create(config, CONTROLLER, CGNAME)
Cgroup.set(config, CGNAME, SETTING, VALUE)
@@ -54,6 +65,10 @@ def teardown(config):
Cgroup.delete(config, CONTROLLER, CGNAME)
def main(config):
+ [result, cause] = prereqs(config)
+ if result != consts.TEST_PASSED:
+ return [result, cause]
+
setup(config)
[result, cause] = test(config)
teardown(config)
diff --git a/ftests/Makefile.am b/ftests/Makefile.am
index 68afb0e26a60..acae5ac7d5ac 100644
--- a/ftests/Makefile.am
+++ b/ftests/Makefile.am
@@ -19,7 +19,7 @@
# along with this library; if not, see <http://www.gnu.org/licenses>.
#
-TESTS = 001-cgget-basic_cgget.py \
+TESTS = 001-cgget-basic_cgget_v1.py \
002-cgdelete-recursive_delete.py
EXTRA_DIST = *.py README.md default.conf
--
2.25.4
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
