Update test 001-cgget-basic_cgget.py to run on cgroup
v1 or v2 systems
Signed-off-by: Tom Hromatka <[email protected]>
---
ftests/001-cgget-basic_cgget.py | 38 +++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/ftests/001-cgget-basic_cgget.py b/ftests/001-cgget-basic_cgget.py
index c8cd3fd68a7f..5d3fdb8dd4d1 100755
--- a/ftests/001-cgget-basic_cgget.py
+++ b/ftests/001-cgget-basic_cgget.py
@@ -29,24 +29,48 @@ import sys
CONTROLLER='cpu'
CGNAME="001cgget"
-SETTING='cpu.shares'
-VALUE='512'
+CGV1_SETTING='cpu.shares'
+CGV1_VALUE='512'
+CGV2_SETTING='cpu.weight'
+CGV2_VALUE='102'
+
+version = Cgroup.CGROUP_UNK
def setup(config):
+ global version
+
Cgroup.create(config, CONTROLLER, CGNAME)
- Cgroup.set(config, CGNAME, SETTING, VALUE)
+ version = Cgroup.version(CONTROLLER)
+ if version == Cgroup.CGROUP_UNK:
+ raise ValueError("Unable to get the controller version for {}".format(
+ CONTROLLER))
+
+ if version == Cgroup.CGROUP_V1:
+ Cgroup.set(config, CGNAME, CGV1_SETTING, CGV1_VALUE)
+ else:
+ Cgroup.set(config, CGNAME, CGV2_SETTING, CGV2_VALUE)
def test(config):
result = consts.TEST_PASSED
cause = None
+ if version == Cgroup.CGROUP_V1:
+ setting = CGV1_SETTING
+ else:
+ setting = CGV2_SETTING
+
value = Cgroup.get(config, controller=None, cgname=CGNAME,
- setting=SETTING, print_headers=False,
+ setting=setting, print_headers=False,
values_only=True)
- if value != VALUE:
- result = consts.TEST_FAILED
- cause = "cgget expected {} but received {}".format(VALUE, value)
+ if version == Cgroup.CGROUP_V1:
+ if value != CGV1_VALUE:
+ result = consts.TEST_FAILED
+ cause = "cgget expected {} but received {}".format(CGV1_VALUE,
value)
+ else:
+ if value != CGV2_VALUE:
+ result = consts.TEST_FAILED
+ cause = "cgget expected {} but received {}".format(CGV2_VALUE,
value)
return result, cause
--
2.25.4
_______________________________________________
Libcg-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libcg-devel
