From 60fa6ed4442279c2c42a72ee34c51b401e6a18d0 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 27 Apr 2016 09:34:04 +0200 Subject: frontend: merge baseldap.CallbackRegistry into Command Also make it possible for subclasses to introduce new callback types. https://fedorahosted.org/freeipa/ticket/4739 Reviewed-By: David Kupka --- ipatests/test_xmlrpc/test_baseldap_plugin.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ipatests/test_xmlrpc/test_baseldap_plugin.py') diff --git a/ipatests/test_xmlrpc/test_baseldap_plugin.py b/ipatests/test_xmlrpc/test_baseldap_plugin.py index 6764b1051..faec5e598 100644 --- a/ipatests/test_xmlrpc/test_baseldap_plugin.py +++ b/ipatests/test_xmlrpc/test_baseldap_plugin.py @@ -26,6 +26,7 @@ import ldap from ipapython.dn import DN from ipapython import ipaldap from ipalib import errors +from ipalib.frontend import Command from ipalib.plugins import baseldap from ipatests.util import assert_deepequal import pytest @@ -33,7 +34,7 @@ import pytest @pytest.mark.tier0 def test_exc_wrapper(): - """Test the CallbackInterface._exc_wrapper helper method""" + """Test the BaseLDAPCommand._exc_wrapper helper method""" handled_exceptions = [] class test_callback(baseldap.BaseLDAPCommand): @@ -77,8 +78,8 @@ def test_exc_wrapper(): @pytest.mark.tier0 def test_callback_registration(): - class callbacktest_base(baseldap.CallbackInterface): - _callback_registry = dict(test={}) + class callbacktest_base(Command): + callback_types = Command.callback_types + ('test',) def test_callback(self, param): messages.append(('Base test_callback', param)) -- cgit