diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-03-23 19:36:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-03-23 19:36:22 +0000 |
commit | 8d5ca073cd9eb0385921f1a59f0e0856cc7a3a7a (patch) | |
tree | 827d77d0a22b428c24feb5c3dfe216c4eb1c8842 | |
parent | 32e8ac0900e9d176afc3d6d555f501a313f8e4f4 (diff) | |
parent | 9b76ad7e1d215856731ea8b9f2f82f12e6463a6e (diff) | |
download | python-ceilometerclient-8d5ca073cd9eb0385921f1a59f0e0856cc7a3a7a.tar.gz |
Merge "Set auth_plugin in __init__"
-rw-r--r-- | ceilometerclient/shell.py | 4 | ||||
-rw-r--r-- | ceilometerclient/tests/unit/test_shell.py | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 8057933..10a43d5 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -46,6 +46,9 @@ def _positive_non_zero_int(argument_value): class CeilometerShell(object): + def __init__(self): + self.auth_plugin = ceiloclient.AuthPlugin() + def get_base_parser(self): parser = argparse.ArgumentParser( prog='ceilometer', @@ -158,7 +161,6 @@ class CeilometerShell(object): def parse_args(self, argv): # Parse args once to find version - self.auth_plugin = ceiloclient.AuthPlugin() parser = self.get_base_parser() (options, args) = parser.parse_known_args(argv) self.auth_plugin.parse_opts(options) diff --git a/ceilometerclient/tests/unit/test_shell.py b/ceilometerclient/tests/unit/test_shell.py index 7d06ab7..1f6e301 100644 --- a/ceilometerclient/tests/unit/test_shell.py +++ b/ceilometerclient/tests/unit/test_shell.py @@ -92,6 +92,11 @@ class ShellHelpTest(ShellTestBase): self.assertThat(help_text, matchers.MatchesRegex(r, self.RE_OPTIONS)) + def test_get_base_parser(self): + standalone_shell = ceilometer_shell.CeilometerShell() + parser = standalone_shell.get_base_parser() + self.assertEqual(600, parser.get_default('timeout')) + class ShellKeystoneV2Test(ShellTestBase): |