From 19db292e6d97dfa2e55a71829172e0900da2a514 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Thu, 28 Mar 2019 13:00:03 +0100 Subject: [PATCH] Extend test for orphan automember rules (issue/6476) The test was not executing ipa automember-rebuild --type hostgroup. The test has been extended to execute it twice: Once when it needs to fail because there is an orphan automember rule. Also after this orphan automember rule has been removed. Here the test needs to succeed. Fixes: https://pagure.io/freeipa/issue/7891 Signed-off-by: Thomas Woerner Reviewed-By: Christian Heimes --- ipatests/test_xmlrpc/test_automember_plugin.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py index 94c370972..ecb607bd5 100644 --- a/ipatests/test_xmlrpc/test_automember_plugin.py +++ b/ipatests/test_xmlrpc/test_automember_plugin.py @@ -837,6 +837,15 @@ class TestAutomemberFindOrphans(XMLRPC_test): hostgroup1.ensure_missing() + # Test rebuild (is failing) + try: + api.Command['automember_rebuild'](type=u'hostgroup') + except errors.DatabaseError: + pass + else: + pytest.fail("automember_rebuild was not failing with " + "an orphan automember rule") + # Find obsolete automember rules result = api.Command['automember_find_orphans'](type=u'hostgroup') assert result['count'] == 1 @@ -850,6 +859,12 @@ class TestAutomemberFindOrphans(XMLRPC_test): result = api.Command['automember_find_orphans'](type=u'hostgroup') assert result['count'] == 0 + # Test rebuild (may not be failing) + try: + api.Command['automember_rebuild'](type=u'hostgroup') + except errors.DatabaseError: + assert False + # Final cleanup of automember rule if it still exists with raises_exact(errors.NotFound( reason=u'%s: Automember rule not found' % hostgroup1.cn)):