[389-commits] [389-ds-base] 01/01: Bug 48050 - Add a test case for an issue 49014

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

spichugi pushed a commit to branch master
in repository 389-ds-base.

commit 613e8712dd9dc021f280ec2d01422d80f5e811c3
Author: Sankar Ramalingam <sramling(a)redhat.com&gt;
Date:   Mon May 15 21:01:21 2017 +0530

    Bug 48050 - Add a test case for an issue 49014
    
    Description: Modify test_glinact_nsact test case to include tests
    for account status once the account is disabled by account policy plugin
    
    https://pagure.io/389-ds-base/issue/48050
    
    Reviewed by: spichugi
    
    Signed-off-by: Simon Pichugin <spichugi(a)redhat.com&gt;
---
 dirsrvtests/tests/suites/plugins/accpol_test.py | 47 +++++++++++++------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/dirsrvtests/tests/suites/plugins/accpol_test.py
b/dirsrvtests/tests/suites/plugins/accpol_test.py
index 8583e72..f3fc65a 100644
--- a/dirsrvtests/tests/suites/plugins/accpol_test.py
+++ b/dirsrvtests/tests/suites/plugins/accpol_test.py
@@ -147,29 +147,29 @@ def userpw_reset(topology_st, suffix, subtree, userid, nousrs,
bindusr, bindpw,
     time.sleep(1)
 
 
-def nsact_inact(topology_st, suffix, subtree, userid, nousrs, action):
-    """Activate/inactivate account using ns-activate.pl and
ns-inactivate.pl"""
+def nsact_inact(topology_st, suffix, subtree, userid, nousrs, command, expected):
+    """Account activate/in-activate/status using
ns-activate/inactivate/accountstatus.pl"""
 
-    log.info('Activate/inactivate account using ns-activate.pl and
ns-inactivate.pl')
+    log.info('Account activate/in-activate/status using
ns-activate/inactivate/accountstatus.pl')
     while (nousrs > 0):
         usrrdn = '{}{}'.format(userid, nousrs)
         userdn = 'uid={},{},{}'.format(usrrdn, subtree, suffix)
-        if (action == "Act"):
-            log.info('Activate user {}'.format(userdn))
-            if topology_st.standalone.ds_paths.version < '1.3':
-                nsact = '{}/ns-activate.pl'.format(inst_dir)
-                nsact_cmd = [nsact, '-D', DN_DM, '-w', PASSWORD,
'-I', userdn]
-            else:
-                nsact =
'{}/ns-activate.pl'.format(topology_st.standalone.ds_paths.sbin_dir)
-                nsact_cmd = [nsact, '-Z', SERVERID_STANDALONE, '-D',
DN_DM, '-w', PASSWORD, '-I', userdn]
-        elif (action == "Inact"):
-            log.info('Inactivate user {}'.format(userdn))
-            if topology_st.standalone.ds_paths.version < '1.3':
-                inact = '{}/ns-inactivate.pl'.format(inst_dir)
-                inact_cmd = [inact, '-D', DN_DM, '-w', PASSWORD,
'-I', userdn]
-            else:
-                inact =
'{}/ns-inactivate.pl'.format(topology_st.standalone.ds_paths.sbin_dir)
-                inact_cmd = [inact, '-Z', SERVERID_STANDALONE, '-D',
DN_DM, '-w', PASSWORD, '-I', userdn]
+        log.info('Running {} for user {}'.format(command, userdn))
+        if ds_is_older('1.3'):
+            action = '{}/{}'.format(inst_dir, command)
+            try:
+                output = subprocess.check_output([action, '-D', DN_DM,
'-w', PASSWORD, '-I', userdn])
+            except subprocess.CalledProcessError as err:
+                output = err.output
+        else:
+            action = '{}/{}'.format(topology_st.standalone.ds_paths.sbin_dir,
command)
+            try:
+                output = subprocess.check_output(
+                    [action, '-Z', SERVERID_STANDALONE, '-D', DN_DM,
'-w', PASSWORD, '-I', userdn])
+            except subprocess.CalledProcessError as err:
+                output = err.output
+        log.info('output: {}'.format(output))
+        assert expected in output
         nousrs = nousrs - 1
     time.sleep(1)
 
@@ -695,13 +695,16 @@ def test_glinact_nsact(topology_st, accpol_global):
     add_users(topology_st, suffix, subtree, userid, nousrs, 0)
     log.info('Sleep for 3 secs to check if account is not inactivated, expected value
0')
     time.sleep(3)
-    nsact_inact(topology_st, suffix, subtree, userid, nousrs, "Inact")
-    log.info('Sleep for 10 secs to check if account is inactivated, expected value
0')
+    nsact_inact(topology_st, suffix, subtree, userid, nousrs, "ns-activate.pl",
"")
+    log.info('Sleep for 10 secs to check if account is inactivated, expected value
19')
     time.sleep(10)
-    nsact_inact(topology_st, suffix, subtree, userid, nousrs, "Act")
+    nsact_inact(topology_st, suffix, subtree, userid, nousrs, "ns-activate.pl",
"")
     account_status(topology_st, suffix, subtree, userid, nousrs, 0,
"Disabled")
+    nsact_inact(topology_st, suffix, subtree, userid, nousrs,
"ns-accountstatus.pl",
+                "- inactivated (inactivity limit exceeded)")
     add_time_attr(topology_st, suffix, subtree, userid, nousrs, 'lastLoginTime')
     account_status(topology_st, suffix, subtree, userid, nousrs, 0, "Enabled")
+    nsact_inact(topology_st, suffix, subtree, userid, nousrs,
"ns-accountstatus.pl", "- activated")
     del_users(topology_st, suffix, subtree, userid, nousrs)
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.