From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Mon, 7 Feb 2022 21:59:22 +0000 (-0700)
Subject: ftests: Add a cgreate test with an empty controller field
X-Git-Tag: v3.1.0~308^2~2^2~104^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb3ffd3cb82dca9c20ac05b9032d62c917c89b74;p=thirdparty%2Flibcgroup.git

ftests: Add a cgreate test with an empty controller field

Add a functional test that exercises cgcreate with no controller
specified, e.g.
	cgcreate -g :foo
	cgdelete -g :foo

-----------------------------------------------------------------
Test Results:
        Run Date:                          Dec 24 10:55:56
        Passed:                                  1 test(s)
        Skipped:                                 0 test(s)
        Failed:                                  0 test(s)
-----------------------------------------------------------------
Timing Results:
        Test                                 Time (sec)
        -----------------------------------------------
        setup                                      0.00
        043-cgcreate-empty_controller.py           0.04
        teardown                                   0.00
        -----------------------------------------------
        Total Run Time                             0.04

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/ftests/043-cgcreate-empty_controller.py b/ftests/043-cgcreate-empty_controller.py
new file mode 100755
index 00000000..f7d19cb7
--- /dev/null
+++ b/ftests/043-cgcreate-empty_controller.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+#
+# cgcreate with no controller specified functionality test
+#
+# Copyright (c) 2021-2022 Oracle and/or its affiliates.
+# Author: Tom Hromatka <tom.hromatka@oracle.com>
+#
+
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of version 2.1 of the GNU Lesser General Public License as
+# published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses>.
+#
+
+from cgroup import Cgroup, CgroupVersion
+import consts
+import ftests
+import os
+import sys
+
+# Which controller isn't all that important, but it is important that we
+# have a cgroup v2 controller
+CONTROLLER = 'cpu'
+CGNAME = "043cgcreate"
+
+def prereqs(config):
+    result = consts.TEST_PASSED
+    cause = None
+
+    if CgroupVersion.get_version(CONTROLLER) != CgroupVersion.CGROUP_V2:
+        result = consts.TEST_SKIPPED
+        cause = "This test requires cgroup v2"
+
+    return result, cause
+
+def setup(config):
+    return consts.TEST_PASSED, None
+
+def test(config):
+    result = consts.TEST_PASSED
+    cause = None
+
+    Cgroup.create(config, None, CGNAME)
+
+    # verify the cgroup exists by reading cgroup.procs
+    Cgroup.get(config, controller=None, cgname=CGNAME,
+               setting="cgroup.procs", print_headers=True,
+               values_only=False)
+
+    return result, cause
+
+def teardown(config):
+    Cgroup.delete(config, None, CGNAME)
+
+def main(config):
+    [result, cause] = prereqs(config)
+    if result != consts.TEST_PASSED:
+        return [result, cause]
+
+    setup(config)
+    if result != consts.TEST_PASSED:
+        return [result, cause]
+
+    [result, cause] = test(config)
+    teardown(config)
+
+    return [result, cause]
+
+if __name__ == '__main__':
+    config = ftests.parse_args()
+    # this test was invoked directly.  run only it
+    config.args.num = int(os.path.basename(__file__).split('-')[0])
+    sys.exit(ftests.main(config))
+
+# vim: set et ts=4 sw=4:
diff --git a/ftests/cgroup.py b/ftests/cgroup.py
index 04f3a09f..327fb2a7 100644
--- a/ftests/cgroup.py
+++ b/ftests/cgroup.py
@@ -160,8 +160,11 @@ class Cgroup(object):
         if cghelp:
             cmd.append('-h')
 
-        controllers_and_path = '{}:{}'.format(
-            ','.join(controller_list), cgname)
+        if controller_list:
+            controllers_and_path = '{}:{}'.format(
+                ','.join(controller_list), cgname)
+        else:
+            controllers_and_path = ':{}'.format(cgname)
 
         cmd.append('-g')
         cmd.append(controllers_and_path)
@@ -185,8 +188,11 @@ class Cgroup(object):
         if recursive:
             cmd.append('-r')
 
-        controllers_and_path = '{}:{}'.format(
-            ','.join(controller_list), cgname)
+        if controller_list:
+            controllers_and_path = '{}:{}'.format(
+                ','.join(controller_list), cgname)
+        else:
+            controllers_and_path = ':{}'.format(cgname)
 
         cmd.append('-g')
         cmd.append(controllers_and_path)