diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2015-09-10 16:10:55 -0500 |
|---|---|---|
| committer | Lin Hua Cheng <os.lcheng@gmail.com> | 2015-10-02 01:20:40 +0000 |
| commit | faece91756fd37c02e1d16e2a7f1176621d7e896 (patch) | |
| tree | 03384dd8237d2bc305dffcb32923848debc9a98e /openstackclient/tests | |
| parent | 4733fd0d3cd328a8abbd62cbfabd973b0986c58c (diff) | |
| download | python-openstackclient-faece91756fd37c02e1d16e2a7f1176621d7e896.tar.gz | |
cleanup account ids from container commands
use a common function to determine account ID instead of different
ways - depending on the response and command
Change-Id: I95adc5dc7d5a82a2cffc570d1ded24d1fc754a11
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/api/test_object_store_v1.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_container_all.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_object_all.py | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py index b18a003d..323bb8e0 100644 --- a/openstackclient/tests/api/test_object_store_v1.py +++ b/openstackclient/tests/api/test_object_store_v1.py @@ -157,6 +157,7 @@ class TestContainer(TestObjectAPIv1): 'container': 'qaz', 'object_count': '1', 'bytes_used': '577', + 'meta-owner': FAKE_ACCOUNT, 'read_acl': None, 'write_acl': None, 'sync_to': None, @@ -322,6 +323,7 @@ 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', diff --git a/openstackclient/tests/object/v1/test_container_all.py b/openstackclient/tests/object/v1/test_container_all.py index 8b200e09..4477f2e0 100644 --- a/openstackclient/tests/object/v1/test_container_all.py +++ b/openstackclient/tests/object/v1/test_container_all.py @@ -316,6 +316,7 @@ class TestContainerShow(TestContainerAll): 'account', 'bytes_used', 'container', + 'meta-owner', 'object_count', 'read_acl', 'sync_key', @@ -327,6 +328,7 @@ class TestContainerShow(TestContainerAll): object_fakes.ACCOUNT_ID, '123', 'ernie', + object_fakes.ACCOUNT_ID, '42', 'qaz', 'rfv', diff --git a/openstackclient/tests/object/v1/test_object_all.py b/openstackclient/tests/object/v1/test_object_all.py index 7a76ab76..41fe6324 100644 --- a/openstackclient/tests/object/v1/test_object_all.py +++ b/openstackclient/tests/object/v1/test_object_all.py @@ -160,6 +160,7 @@ class TestObjectShow(TestObjectAll): 'content-type', 'etag', 'last-modified', + 'meta-owner', 'object', 'x-object-manifest', ) @@ -171,6 +172,7 @@ class TestObjectShow(TestObjectAll): 'text/plain', '4c4e39a763d58392724bccf76a58783a', 'yesterday', + object_fakes.ACCOUNT_ID, object_fakes.object_name_1, 'manifest', ) |