From 09a8f62d12c0be26741c24845cda2be83f14c503 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Thu, 15 Sep 2016 14:38:49 +0200 Subject: test_plugable: update the rest of test_init In commit ed4c2d9252a995d01dc098e5b761ded8cd9373d8, changes to the Plugin class were made, but the test was updated only partially. Update the rest to fix the failing test. https://fedorahosted.org/freeipa/ticket/6313 Reviewed-By: Martin Basti --- ipatests/test_ipalib/test_plugable.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ipatests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py index 0ea02a71b..8617c7343 100644 --- a/ipatests/test_ipalib/test_plugable.py +++ b/ipatests/test_ipalib/test_plugable.py @@ -26,7 +26,7 @@ Test the `ipalib.plugable` module. from ipatests.util import raises, read_only from ipatests.util import ClassChecker, create_test_api -from ipalib import plugable, errors, text +from ipalib import plugable, errors import pytest @@ -52,7 +52,7 @@ class test_Plugin(ClassChecker): api = 'the api instance' o = self.cls(api) assert o.name == 'Plugin' - assert isinstance(o.doc, text.Gettext) + assert isinstance(o.doc, str) class some_subclass(self.cls): """ Do sub-classy things. @@ -66,11 +66,12 @@ class test_Plugin(ClassChecker): o = some_subclass(api) assert o.name == 'some_subclass' assert o.summary == 'Do sub-classy things.' - assert isinstance(o.doc, text.Gettext) + assert isinstance(o.doc, str) class another_subclass(self.cls): pass o = another_subclass(api) - assert o.summary == '<%s>' % o.fullname + assert o.summary == u'<%s.%s>' % (another_subclass.__module__, + another_subclass.__name__) # Test that Plugin makes sure the subclass hasn't defined attributes # whose names conflict with the logger methods set in Plugin.__init__(): -- cgit