diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2015-09-11 00:46:03 -0500 |
|---|---|---|
| committer | Steve Martinelli <stevemar@ca.ibm.com> | 2015-10-10 11:48:07 -0400 |
| commit | 1f8b81462826284068b96ffce2648344c9e7c644 (patch) | |
| tree | 164260390cb8c43eb109a408aa55504495d85d48 /openstackclient/tests/api | |
| parent | 4759a84703cabbbc2449281e1b34dbf43da9bad4 (diff) | |
| download | python-openstackclient-1f8b81462826284068b96ffce2648344c9e7c644.tar.gz | |
Fix up object-store show commands
1) Change metadata to appear under a common 'properties' key, and
use the utility to format them, this applied to object, account
and container.
2) Clean up container and object output, which were setting the
x-container-meta-owner property, but this is metadata only for
the container, so it's pointless to have, removed it.
3) Container show was showing read/write ACLs and sync stuff, but
these are not being returned by my swift by default, so I moved
these to be checks, so we don't clutter the output.
Change-Id: Ife7521fe9c2724035b06963c118bd6016ba2f5b5
Diffstat (limited to 'openstackclient/tests/api')
| -rw-r--r-- | openstackclient/tests/api/test_object_store_v1.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py index 323bb8e0..0f7c4559 100644 --- a/openstackclient/tests/api/test_object_store_v1.py +++ b/openstackclient/tests/api/test_object_store_v1.py @@ -157,11 +157,6 @@ class TestContainer(TestObjectAPIv1): 'container': 'qaz', 'object_count': '1', 'bytes_used': '577', - 'meta-owner': FAKE_ACCOUNT, - 'read_acl': None, - 'write_acl': None, - 'sync_to': None, - 'sync_key': None, } self.requests_mock.register_uri( 'HEAD', @@ -323,10 +318,8 @@ class TestObject(TestObjectAPIv1): 'content-type': 'text/alpha', 'content-length': '577', 'last-modified': '20130101', - 'meta-owner': FAKE_ACCOUNT, 'etag': 'qaz', - 'wife': 'Wilma', - 'x-tra-header': 'yabba-dabba-do', + 'properties': {'wife': 'Wilma'}, } self.requests_mock.register_uri( 'HEAD', |