From a05cbf4c998678a3619d82dd49be2b7759373d60 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 29 Apr 2015 22:59:02 -0500 Subject: Rework shell tests This is the first step in reworking the shell argument handling, clean up and add tests to ensure functionality doesn't change. * Rework shell tests to break down global options and auth options. * Make tests table-driven * Remove 'os_' from 'cacert' and 'default_domain' internal option names Change-Id: Icf69c7e84f3f44b366fe64b6bbf4e3fe958eb302 --- examples/object_api.py | 4 ++-- examples/osc-lib.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/object_api.py b/examples/object_api.py index 441013ca..11b62da7 100755 --- a/examples/object_api.py +++ b/examples/object_api.py @@ -52,8 +52,8 @@ def run(opts): # NOTE(dtroyer): This converts from the usual OpenStack way to the single # requests argument and is an app-specific thing because # we want to be like OpenStackClient. - if opts.os_cacert: - verify = opts.os_cacert + if opts.cacert: + verify = opts.cacert else: verify = not opts.insecure diff --git a/examples/osc-lib.py b/examples/osc-lib.py index 84501903..abaa1871 100755 --- a/examples/osc-lib.py +++ b/examples/osc-lib.py @@ -62,8 +62,8 @@ def run(opts): # NOTE(dtroyer): This converts from the usual OpenStack way to the single # requests argument and is an app-specific thing because # we want to be like OpenStackClient. - if opts.os_cacert: - verify = opts.os_cacert + if opts.cacert: + verify = opts.cacert else: verify = not opts.insecure -- cgit v1.2.1