Ticket 47824 - Remove CI test from tickets and add logging

Description: Test suite at tickets/ticket47824_test.py contains
the test case that was already implemented at suites/paged_results/.

Fix description: Remove it and add additional logging to the paged_results
test suite

https://fedorahosted.org/389/ticket/47824

Reviewd by: mreynolds (Thanks!)

dirsrvtests/tests/suites/paged_results/paged_results_test.py

@@ -19,7 +19,13 @@ from lib389.tasks import *
 from lib389.utils import *
 from sss_control import SSSRequestControl
 
-logging.getLogger(__name__).setLevel(logging.DEBUG)
+DEBUGGING = False
+
+if DEBUGGING:
+    logging.getLogger(__name__).setLevel(logging.DEBUG)
+else:
+    logging.getLogger(__name__).setLevel(logging.INFO)
+
 log = logging.getLogger(__name__)
 
 TEST_USER_NAME = 'simplepaged_test'
@@ -227,7 +233,13 @@ def paged_search(topology, suffix, controls, search_flt, searchreq_attrlist):
     pages = 0
     pctrls = []
     all_results = []
-    req_ctrl = controls[0]
+    req_pr_ctrl = controls[0]
+    log.info('Running simple paged result search with - '
+             'search suffix: {}; filter: {}; attr list {}; '
+             'page_size = {}; controls: {}.'.format(suffix, search_flt,
+                                                    searchreq_attrlist,
+                                                    req_pr_ctrl.size,
+                                                    str(controls)))
     msgid = topology.standalone.search_ext(suffix,
                                            ldap.SCOPE_SUBTREE,
                                            search_flt,
@@ -236,6 +248,7 @@ def paged_search(topology, suffix, controls, search_flt, searchreq_attrlist):
     while True:
         log.info('Getting page %d' % (pages,))
         rtype, rdata, rmsgid, rctrls = topology.standalone.result3(msgid)
+        log.debug('Data: {}'.format(rdata))
         all_results.extend(rdata)
         pages += 1
         pctrls = [
@@ -247,7 +260,8 @@ def paged_search(topology, suffix, controls, search_flt, searchreq_attrlist):
         if pctrls:
             if pctrls[0].cookie:
                 # Copy cookie from response control to request control
-                req_ctrl.cookie = pctrls[0].cookie
+                log.debug('Cookie: {}'.format(pctrls[0].cookie))
+                req_pr_ctrl.cookie = pctrls[0].cookie
                 msgid = topology.standalone.search_ext(suffix,
                                                        ldap.SCOPE_SUBTREE,
                                                        search_flt,
@@ -287,7 +301,6 @@ def test_search_success(topology, test_user, page_size, users_num):
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
 
         all_results = paged_search(topology, DEFAULT_SUFFIX, [req_ctrl],
@@ -428,7 +441,6 @@ def test_search_sort_success(topology, test_user):
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         sort_ctrl = SSSRequestControl(True, ['sn'])
 
@@ -846,7 +858,6 @@ def test_search_pagedsizelimit_success(topology, test_user):
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         controls = [req_ctrl]
 
@@ -909,7 +920,6 @@ def test_search_nspagedsizelimit(topology, test_user,
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         controls = [req_ctrl]
 
@@ -984,7 +994,6 @@ def test_search_paged_limits(topology, test_user, conf_attr_values, expected_rs)
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         controls = [req_ctrl]
 
@@ -1063,7 +1072,6 @@ def test_search_paged_user_limits(topology, test_user, conf_attr_values, expecte
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         controls = [req_ctrl]
 
@@ -1118,7 +1126,6 @@ def test_ger_basic(topology, test_user):
         log.info('Set bind to directory manager')
         topology.standalone.simple_bind_s(DN_DM, PASSWORD)
 
-        log.info('Create simple paged results control instance')
         spr_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
         ger_ctrl = GetEffectiveRightsControl(True, "dn: " + DN_DM)
 
@@ -1167,7 +1174,6 @@ def test_multi_suffix_search(topology, test_user, new_suffixes):
         log.info('Set DM bind')
         topology.standalone.simple_bind_s(DN_DM, PASSWORD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
 
         all_results = paged_search(topology, NEW_SUFFIX_1, [req_ctrl],
@@ -1223,7 +1229,6 @@ def test_maxsimplepaged_per_conn_success(topology, test_user, conf_attr_value):
         log.info('Set user bind')
         topology.standalone.simple_bind_s(TEST_USER_DN, TEST_USER_PWD)
 
-        log.info('Create simple paged results control instance')
         req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
 
         all_results = paged_search(topology, DEFAULT_SUFFIX, [req_ctrl],

dirsrvtests/tests/tickets/ticket47824_test.py

@@ -1,265 +0,0 @@
-# --- BEGIN COPYRIGHT BLOCK ---
-# Copyright (C) 2015 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details. 
-# --- END COPYRIGHT BLOCK ---
-#
-import os
-import sys
-import time
-import ldap
-import logging
-import pytest
-from lib389 import DirSrv, Entry, tools, tasks
-from lib389.tools import DirSrvTools
-from lib389._constants import *
-from lib389.properties import *
-from lib389.tasks import *
-from ldap.controls import SimplePagedResultsControl
-
-log = logging.getLogger(__name__)
-
-installation_prefix = None
-
-MYSUFFIX = 'o=ticket47824.org'
-MYSUFFIXBE = 'ticket47824'
-SUBSUFFIX0 = 'ou=OU0,o=ticket47824.org'
-SUBSUFFIX0BE = 'OU0'
-SUBSUFFIX1 = 'ou=OU1,o=ticket47824.org'
-SUBSUFFIX1BE = 'OU1'
-SUBSUFFIX2 = 'ou=OU2,o=ticket47824.org'
-SUBSUFFIX2BE = 'OU2'
-
-_MYLDIF = 'ticket47824.ldif'
-_SUBLDIF0TMP = 'ticket47824_0.tmp'
-_SUBLDIF0 = 'ticket47824_0.ldif'
-_SUBLDIF1TMP = 'ticket47824_1.tmp'
-_SUBLDIF1 = 'ticket47824_1.ldif'
-_SUBLDIF2TMP = 'ticket47824_2.tmp'
-_SUBLDIF2 = 'ticket47824_2.ldif'
-
-SEARCHFILTER = '(objectclass=*)'
-
-
-class TopologyStandalone(object):
-    def __init__(self, standalone):
-        standalone.open()
-        self.standalone = standalone
-
-
[email protected](scope="module")
-def topology(request):
-    '''
-        This fixture is used to standalone topology for the 'module'.
-    '''
-    global installation_prefix
-
-    if installation_prefix:
-        args_instance[SER_DEPLOYED_DIR] = installation_prefix
-
-    standalone = DirSrv(verbose=False)
-
-    # Args for the standalone instance
-    args_instance[SER_HOST] = HOST_STANDALONE
-    args_instance[SER_PORT] = PORT_STANDALONE
-    args_instance[SER_SERVERID_PROP] = SERVERID_STANDALONE
-    args_standalone = args_instance.copy()
-    standalone.allocate(args_standalone)
-
-    # Get the status of the instance and restart it if it exists
-    instance_standalone = standalone.exists()
-
-    # Remove the instance
-    if instance_standalone:
-        standalone.delete()
-
-    # Create the instance
-    standalone.create()
-
-    # Used to retrieve configuration information (dbdir, confdir...)
-    standalone.open()
-
-    # clear the tmp directory
-    standalone.clearTmpDir(__file__)
-
-    # Here we have standalone instance up and running
-    return TopologyStandalone(standalone)
-
-
-def test_ticket47824_run(topology):
-    """
-        Add 3 sub suffixes under the primary suffix
-        Import 16 entries each
-        Search with Simple Paged Results Control from the primary suffix (pagesize = 4)
-        If all of them are returned, the bug is verified
-    """
-    log.info('Testing Ticket 47824 - paged results control is not working in some cases when we have a subsuffix')
-
-    # bind as directory manager
-    topology.standalone.log.info("Bind as %s" % DN_DM)
-    topology.standalone.simple_bind_s(DN_DM, PASSWORD)
-
-    topology.standalone.log.info("\n\n######################### SETUP SUFFIX o=ticket47824.org ######################\n")
-
-    topology.standalone.backend.create(MYSUFFIX, {BACKEND_NAME: MYSUFFIXBE})
-    topology.standalone.mappingtree.create(MYSUFFIX, bename=MYSUFFIXBE)
-
-    topology.standalone.log.info("\n\n######################### SETUP SUB SUFFIX ou=OU0 ######################\n")
-
-    topology.standalone.backend.create(SUBSUFFIX0, {BACKEND_NAME: SUBSUFFIX0BE})
-    topology.standalone.mappingtree.create(SUBSUFFIX0, bename=SUBSUFFIX0BE, parent=MYSUFFIX)
-
-    topology.standalone.log.info("\n\n######################### SETUP SUB SUFFIX ou=OU1 ######################\n")
-
-    topology.standalone.backend.create(SUBSUFFIX1, {BACKEND_NAME: SUBSUFFIX1BE})
-    topology.standalone.mappingtree.create(SUBSUFFIX1, bename=SUBSUFFIX1BE, parent=MYSUFFIX)
-
-    topology.standalone.log.info("\n\n######################### SETUP SUB SUFFIX ou=OU2 ######################\n")
-
-    topology.standalone.backend.create(SUBSUFFIX2, {BACKEND_NAME: SUBSUFFIX2BE})
-    topology.standalone.mappingtree.create(SUBSUFFIX2, bename=SUBSUFFIX2BE, parent=MYSUFFIX)
-
-    topology.standalone.log.info("\n\n######################### Generate Test data ######################\n")
-
-    # get tmp dir
-    mytmp = topology.standalone.getDir(__file__, TMP_DIR)
-    if mytmp is None:
-        mytmp = "/tmp"
-
-    MYLDIF = '%s%s' % (mytmp, _MYLDIF)
-    SUBLDIF0TMP = '%s%s' % (mytmp, _SUBLDIF0TMP)
-    SUBLDIF0 = '%s%s' % (mytmp, _SUBLDIF0)
-    SUBLDIF1TMP = '%s%s' % (mytmp, _SUBLDIF1TMP)
-    SUBLDIF1 = '%s%s' % (mytmp, _SUBLDIF1)
-    SUBLDIF2TMP = '%s%s' % (mytmp, _SUBLDIF2TMP)
-    SUBLDIF2 = '%s%s' % (mytmp, _SUBLDIF2)
-
-    os.system('ls %s' % MYLDIF)
-    os.system('ls %s' % SUBLDIF0TMP)
-    os.system('ls %s' % SUBLDIF1TMP)
-    os.system('ls %s' % SUBLDIF2TMP)
-    os.system('rm -f %s' % MYLDIF)
-    os.system('rm -f %s' % SUBLDIF0TMP)
-    os.system('rm -f %s' % SUBLDIF1TMP)
-    os.system('rm -f %s' % SUBLDIF2TMP)
-    if hasattr(topology.standalone, 'prefix'):
-        prefix = topology.standalone.prefix
-    else:
-        prefix = None
-    dbgen_prog = prefix + '/bin/dbgen.pl'
-    topology.standalone.log.info('dbgen: %s' % dbgen_prog)
-    os.system('%s -s %s -o %s -n 10' % (dbgen_prog, MYSUFFIX, MYLDIF))
-    os.system('%s -s %s -o %s -n 10' % (dbgen_prog, SUBSUFFIX0, SUBLDIF0TMP))
-    os.system('%s -s %s -o %s -n 10' % (dbgen_prog, SUBSUFFIX1, SUBLDIF1TMP))
-    os.system('%s -s %s -o %s -n 10' % (dbgen_prog, SUBSUFFIX2, SUBLDIF2TMP))
-
-    os.system('cat %s | sed -e "s/\<objectClass: organization\>/objectClass: organizationalUnit/" | sed -e "/^o:.*/d" > %s' % (SUBLDIF0TMP, SUBLDIF0))
-    os.system('cat %s | sed -e "s/\<objectClass: organization\>/objectClass: organizationalUnit/" | sed -e "/^o:.*/d" > %s' % (SUBLDIF1TMP, SUBLDIF1))
-    os.system('cat %s | sed -e "s/\<objectClass: organization\>/objectClass: organizationalUnit/" | sed -e "/^o:.*/d" > %s' % (SUBLDIF2TMP, SUBLDIF2))
-
-    cmdline = 'egrep dn: %s %s %s %s | wc -l' % (MYLDIF, SUBLDIF0, SUBLDIF1, SUBLDIF2)
-    p = os.popen(cmdline, "r")
-    dnnumstr = p.readline()
-    dnnum = int(dnnumstr)
-    topology.standalone.log.info("We have %d entries.\n", dnnum)
-
-    topology.standalone.log.info("\n\n######################### Import Test data ######################\n")
-
-    args = {TASK_WAIT: True}
-    importTask = Tasks(topology.standalone)
-    importTask.importLDIF(MYSUFFIX, MYSUFFIXBE, MYLDIF, args)
-    importTask.importLDIF(SUBSUFFIX0, SUBSUFFIX0BE, SUBLDIF0, args)
-    importTask.importLDIF(SUBSUFFIX1, SUBSUFFIX1BE, SUBLDIF1, args)
-    importTask.importLDIF(SUBSUFFIX2, SUBSUFFIX2BE, SUBLDIF2, args)
-
-    topology.standalone.log.info("\n\n######################### SEARCH ALL ######################\n")
-    topology.standalone.log.info("Bind as %s and add the READ/SEARCH SELFDN aci" % DN_DM)
-    topology.standalone.simple_bind_s(DN_DM, PASSWORD)
-
-    entries = topology.standalone.search_s(MYSUFFIX, ldap.SCOPE_SUBTREE, SEARCHFILTER)
-    topology.standalone.log.info("Returned %d entries.\n", len(entries))
-
-    #print entries
-
-    assert dnnum == len(entries)
-
-    topology.standalone.log.info('%d entries are successfully imported.' % dnnum)
-
-    topology.standalone.log.info("\n\n######################### SEARCH WITH SIMPLE PAGED RESULTS CONTROL ######################\n")
-
-    page_size = 4
-    req_ctrl = SimplePagedResultsControl(True, size=page_size, cookie='')
-
-    known_ldap_resp_ctrls = {
-        SimplePagedResultsControl.controlType: SimplePagedResultsControl,
-    }
-
-    topology.standalone.log.info("Calling search_ext...")
-    msgid = topology.standalone.search_ext(MYSUFFIX, ldap.SCOPE_SUBTREE, SEARCHFILTER, None, serverctrls=[req_ctrl])
-
-    pageddncnt = 0
-    pages = 0
-    while True:
-        pages += 1
-
-        topology.standalone.log.info("Getting page %d" % pages)
-        rtype, rdata, rmsgid, serverctrls = topology.standalone.result3(msgid, resp_ctrl_classes=known_ldap_resp_ctrls)
-        topology.standalone.log.info("%d results" % len(rdata))
-        pageddncnt += len(rdata)
-
-        topology.standalone.log.info("Results:")
-        for dn, attrs in rdata:
-            topology.standalone.log.info("dn: %s" % dn)
-
-        pctrls = [
-            c for c in serverctrls if c.controlType == SimplePagedResultsControl.controlType
-        ]
-        if not pctrls:
-            topology.standalone.log.info('Warning: Server ignores RFC 2696 control.')
-            break
-
-        if pctrls[0].cookie:
-            req_ctrl.cookie = pctrls[0].cookie
-            topology.standalone.log.info("cookie: %s" % req_ctrl.cookie)
-            msgid = topology.standalone.search_ext(MYSUFFIX,
-                                                   ldap.SCOPE_SUBTREE,
-                                                   SEARCHFILTER,
-                                                   None,
-                                                   serverctrls=[req_ctrl])
-        else:
-            topology.standalone.log.info("No cookie")
-            break
-
-    topology.standalone.log.info("Paged result search returned %d entries.\n", pageddncnt)
-
-    assert dnnum == len(entries)
-    topology.standalone.log.info("ticket47824 was successfully verified.")
-
-
-def test_ticket47824_final(topology):
-    topology.standalone.delete()
-    log.info('Testcase PASSED')
-
-
-def run_isolated():
-    '''
-        run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..)
-        To run isolated without py.test, you need to
-            - edit this file and comment '@pytest.fixture' line before 'topology' function.
-            - set the installation prefix
-            - run this program
-    '''
-    global installation_prefix
-    installation_prefix = None
-
-    topo = topology(True)
-    test_ticket47824_run(topo)
-
-    test_ticket47824_final(topo)
-
-
-if __name__ == '__main__':
-    run_isolated()
-