test-020: fix issues on unsuccessful no-container runs

Running the test with --no-container, might cause an issue with useradd
or groupadd command if the home directory of the test user exists/test
user group exists.

The home directory of the user doesn't get removed by default on all
distros, so explicitly pass the '-r' flag to userdel to remove the
directory.  Whereas user group might exist due to unsuccessful test
runs, address it by passing '-f' flags to groupadd command, that
returns success even if the group exists, that will be removed
by the groupdel command at the exit.

This is not an issue with containers test cases, because they are
created and destroyed for every test case execution.

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

diff --git a/ftests/020-cgconfig-tasks_perms_owner.py b/ftests/020-cgconfig-tasks_perms_owner.py
index 41106fa0da0d46d16a9ed9746d512590cdd2ed10..65c1410d9c132cf6e04cee225fbd15a7b8e0800e 100755 (executable)
--- a/ftests/020-cgconfig-tasks_perms_owner.py
+++ b/ftests/020-cgconfig-tasks_perms_owner.py
@@ -54,7 +54,7 @@ def setup(config):
         config.container.run(['groupadd', GROUP])
     else:
         Run.run(['sudo', 'useradd', '-p', 'Test020#1', USER])
-        Run.run(['sudo', 'groupadd', GROUP])
+        Run.run(['sudo', 'groupadd', '-f', GROUP])
 
 
 def test(config):
@@ -106,7 +106,7 @@ def teardown(config):
             config.container.run(['userdel', USER])
             config.container.run(['groupdel', GROUP])
         else:
-            Run.run(['sudo', 'userdel', USER])
+            Run.run(['sudo', 'userdel', '-r', USER])
             Run.run(['sudo', 'groupdel', GROUP])
     except (ContainerError, RunError, ValueError):
         pass