From 83d6c95e4636049a5bcedb533ad49f6e2cf79dfe Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Mon, 27 Oct 2008 23:39:43 -0600 Subject: API.load_plugins() no longer takes dry_run=False kwarg and instead checks in env.mode == 'unit_test' to decide whether to load the plugins; it also only loads ipa_server.plugins in env.in_server is True --- ipalib/cli.py | 2 +- ipalib/plugable.py | 7 ++++--- tests/test_ipalib/test_cli.py | 2 +- tests/test_ipalib/test_plugable.py | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ipalib/cli.py b/ipalib/cli.py index 671d4053..3613dfeb 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -245,7 +245,7 @@ class CLI(object): """ self.__doing('run') self.finalize() - if self.api.env.mode == 'unit-test': + if self.api.env.mode == 'unit_test': return if len(self.cmd_argv) < 1: self.print_commands() diff --git a/ipalib/plugable.py b/ipalib/plugable.py index 6fe22429..8d689f7d 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -739,7 +739,7 @@ class API(DictProxy): self.env._bootstrap(**overrides) self.env._finalize_core(**dict(constants.DEFAULT_CONFIG)) - def load_plugins(self, dry_run=False): + def load_plugins(self): """ Load plugins from all standard locations. @@ -748,10 +748,11 @@ class API(DictProxy): """ self.__doing('load_plugins') self.__do_if_not_done('bootstrap') - if dry_run: + if self.env.mode == 'unit_test': return util.import_plugins_subpackage('ipalib') - util.import_plugins_subpackage('ipa_server') + if self.env.in_server: + util.import_plugins_subpackage('ipa_server') def finalize(self): """ diff --git a/tests/test_ipalib/test_cli.py b/tests/test_ipalib/test_cli.py index c4740875..7b3239d7 100644 --- a/tests/test_ipalib/test_cli.py +++ b/tests/test_ipalib/test_cli.py @@ -110,7 +110,7 @@ class test_CLI(ClassChecker): frontend.Application, backend.Backend, ) - api.env.mode = 'unit-test' + api.env.mode = 'unit_test' api.env.in_tree = True o = self.cls(api, argv) assert o.api is api diff --git a/tests/test_ipalib/test_plugable.py b/tests/test_ipalib/test_plugable.py index 85b5303c..c7b8abbd 100644 --- a/tests/test_ipalib/test_plugable.py +++ b/tests/test_ipalib/test_plugable.py @@ -774,6 +774,7 @@ class test_API(ClassChecker): def new(self, *bases): home = TempHome() api = self.cls(*bases) + api.env.mode = 'unit_test' api.env.in_tree = True return (api, home) @@ -899,10 +900,10 @@ class test_API(ClassChecker): """ Test the `ipalib.plugable.API.load_plugins` method. """ - o = self.cls() + (o, home) = self.new() assert o.isdone('bootstrap') is False assert o.isdone('load_plugins') is False - o.load_plugins(dry_run=True) + o.load_plugins() assert o.isdone('bootstrap') is True assert o.isdone('load_plugins') is True e = raises(StandardError, o.load_plugins) -- cgit