summaryrefslogtreecommitdiffstats
path: root/ipalib/plugable.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-02-09 17:02:10 -0500
committerRob Crittenden <rcritten@redhat.com>2011-02-10 13:52:29 -0500
commitc187b276ad60e06be260899889628b7979f267e4 (patch)
tree816fea7649069241d1a65fc194afa9e42bae7a7e /ipalib/plugable.py
parentf34c0ab91673ad12edd937e6f3b0e97811f06d6e (diff)
downloadfreeipa-c187b276ad60e06be260899889628b7979f267e4.zip
freeipa-c187b276ad60e06be260899889628b7979f267e4.tar.gz
freeipa-c187b276ad60e06be260899889628b7979f267e4.tar.xz
Fix test failures caused by the performance patch.
It isn't safe to assume there is an environment or mode in any given object. Only skip the extra work if the object explicitly has production in it.
Diffstat (limited to 'ipalib/plugable.py')
-rw-r--r--ipalib/plugable.py23
1 files changed, 17 insertions, 6 deletions
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 82bd522..a7e61dd 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -44,6 +44,17 @@ from constants import DEFAULT_CONFIG, FORMAT_STDERR, FORMAT_FILE
# FIXME: Updated constants.TYPE_ERROR to use this clearer format from wehjit:
TYPE_ERROR = '%s: need a %r; got a %r: %r'
+def is_production_mode(obj):
+ """
+ If the object has self.env.mode defined and that mode is
+ production return True, otherwise return False.
+ """
+ if getattr(obj, 'env', None) is None:
+ return False
+ if getattr(obj.env, 'mode', None) is None:
+ return False
+ return obj.env.mode == 'production'
+
class SetProxy(ReadOnly):
"""
@@ -207,9 +218,8 @@ class Plugin(ReadOnly):
def finalize(self):
"""
"""
- if self.env.mode == 'production':
- return
- lock(self)
+ if not is_production_mode(self):
+ lock(self)
def set_api(self, api):
"""
@@ -597,13 +607,14 @@ class API(DictProxy):
p.bases.append(base)
yield p.instance
+ production_mode = is_production_mode(self)
for name in self.register:
base = self.register[name]
magic = getattr(self.register, name)
namespace = NameSpace(
plugin_iter(base, (magic[k] for k in magic))
)
- if self.env.mode != 'production':
+ if not production_mode:
assert not (
name in self.__d or hasattr(self, name)
)
@@ -612,12 +623,12 @@ class API(DictProxy):
for p in plugins.itervalues():
p.instance.set_api(self)
- if self.env.mode != 'production':
+ if not production_mode:
assert p.instance.api is self
for p in plugins.itervalues():
p.instance.finalize()
- if self.env.mode != 'production':
+ if not production_mode:
assert islocked(p.instance) is True
object.__setattr__(self, '_API__finalized', True)
tuple(PluginInfo(p) for p in plugins.itervalues())