From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Mon, 8 May 2023 05:18:17 +0000 (+0530)
Subject: tests/ftests: cgroup: rename blacklist, whitelist terms
X-Git-Tag: v3.1.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6531d778dbd366b7311955891f1628c16e6ff39a;p=thirdparty%2Flibcgroup.git

tests/ftests: cgroup: rename blacklist, whitelist terms

Rename 'cgsnapshot_blacklist.conf -> cgsnapshot_denylist.conf'.  Also,
update the error messages, check to search for replaced terms.

Suggested-by: Tom Hromatka <tom.hromatka@oracle.com>
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/tests/ftests/cgroup.py b/tests/ftests/cgroup.py
index e8436f5b..25827d17 100644
--- a/tests/ftests/cgroup.py
+++ b/tests/ftests/cgroup.py
@@ -598,13 +598,13 @@ class Cgroup(object):
                 config.container.run(
                                         ['sudo',
                                          'touch',
-                                         '/etc/cgsnapshot_blacklist.conf']
+                                         '/etc/cgsnapshot_denylist.conf']
                                     )
             except RunError as re:
                 if re.ret == 0 and 'unable to resolve host' in re.stderr:
                     pass
         else:
-            Run.run(['sudo', 'touch', '/etc/cgsnapshot_blacklist.conf'])
+            Run.run(['sudo', 'touch', '/etc/cgsnapshot_denylist.conf'])
 
         try:
             if config.args.container:
@@ -613,7 +613,7 @@ class Cgroup(object):
                 res = Run.run(cmd)
         except RunError as re:
             if re.ret == 0 and \
-               'neither blacklisted nor whitelisted' in re.stderr:
+               'neither deny nor allow list' in re.stderr:
                 res = re.stdout
             elif re.ret == 0 and 'ERROR: can\'t get' in re.stderr:
                 res = re.stdout