diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-24 19:51:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-24 19:51:30 +0000 |
| commit | 55d9eba0937944119e6209c85005980c7297d123 (patch) | |
| tree | cabac6840cde898651a0393deb60b6b36e370e82 /openstackclient/tests | |
| parent | 46cc7d12ad202184917822dfa16dc66d066c8538 (diff) | |
| parent | b3335b3474e559d8afb0b7f86796fbb68a0687a8 (diff) | |
| download | python-openstackclient-55d9eba0937944119e6209c85005980c7297d123.tar.gz | |
Merge "Do not set default versions in parsed args"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/test_shell.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py index e2f0580b..0e0cc50b 100644 --- a/openstackclient/tests/test_shell.py +++ b/openstackclient/tests/test_shell.py @@ -41,17 +41,17 @@ DEFAULT_SERVICE_URL = "http://127.0.0.1:8771/v3.0/" DEFAULT_AUTH_PLUGIN = "v2password" DEFAULT_INTERFACE = "internal" -DEFAULT_COMPUTE_API_VERSION = "2" -DEFAULT_IDENTITY_API_VERSION = "2" -DEFAULT_IMAGE_API_VERSION = "2" -DEFAULT_VOLUME_API_VERSION = "1" -DEFAULT_NETWORK_API_VERSION = "2" - -LIB_COMPUTE_API_VERSION = "2" -LIB_IDENTITY_API_VERSION = "2" -LIB_IMAGE_API_VERSION = "1" -LIB_VOLUME_API_VERSION = "1" -LIB_NETWORK_API_VERSION = "2" +DEFAULT_COMPUTE_API_VERSION = "" +DEFAULT_IDENTITY_API_VERSION = "" +DEFAULT_IMAGE_API_VERSION = "" +DEFAULT_VOLUME_API_VERSION = "" +DEFAULT_NETWORK_API_VERSION = "" + +LIB_COMPUTE_API_VERSION = "" +LIB_IDENTITY_API_VERSION = "" +LIB_IMAGE_API_VERSION = "" +LIB_VOLUME_API_VERSION = "" +LIB_NETWORK_API_VERSION = "" CLOUD_1 = { 'clouds': { @@ -203,7 +203,9 @@ class TestShell(utils.TestCase): initialize_app(). """ - self.occ_get_one = mock.Mock("Test Shell") + cloud = mock.Mock(name="cloudy") + cloud.config = {} + self.occ_get_one = mock.Mock(return_value=cloud) with mock.patch( "os_client_config.config.OpenStackConfig.get_one_cloud", self.occ_get_one, |