diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 20:29:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 20:29:07 +0000 |
| commit | 18a7d23a8ab12aa29a13f441cd8608ea5138f420 (patch) | |
| tree | 160bdccfd6502f1ff94db51f4301754ecf73a974 /openstackclient/tests | |
| parent | eab508fddd671b8946094335b93e3ae9db493e29 (diff) | |
| parent | 1f8b81462826284068b96ffce2648344c9e7c644 (diff) | |
| download | python-openstackclient-18a7d23a8ab12aa29a13f441cd8608ea5138f420.tar.gz | |
Merge "Fix up object-store show commands"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/api/test_object_store_v1.py | 9 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_container_all.py | 3 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/test_object_all.py | 2 |
3 files changed, 1 insertions, 13 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', diff --git a/openstackclient/tests/object/v1/test_container_all.py b/openstackclient/tests/object/v1/test_container_all.py index 4477f2e0..69fc0f39 100644 --- a/openstackclient/tests/object/v1/test_container_all.py +++ b/openstackclient/tests/object/v1/test_container_all.py @@ -286,7 +286,6 @@ class TestContainerShow(TestContainerAll): def test_object_show_container(self): headers = { - 'x-container-meta-owner': object_fakes.ACCOUNT_ID, 'x-container-object-count': '42', 'x-container-bytes-used': '123', 'x-container-read': 'qaz', @@ -316,7 +315,6 @@ class TestContainerShow(TestContainerAll): 'account', 'bytes_used', 'container', - 'meta-owner', 'object_count', 'read_acl', 'sync_key', @@ -328,7 +326,6 @@ 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 41fe6324..7a76ab76 100644 --- a/openstackclient/tests/object/v1/test_object_all.py +++ b/openstackclient/tests/object/v1/test_object_all.py @@ -160,7 +160,6 @@ class TestObjectShow(TestObjectAll): 'content-type', 'etag', 'last-modified', - 'meta-owner', 'object', 'x-object-manifest', ) @@ -172,7 +171,6 @@ class TestObjectShow(TestObjectAll): 'text/plain', '4c4e39a763d58392724bccf76a58783a', 'yesterday', - object_fakes.ACCOUNT_ID, object_fakes.object_name_1, 'manifest', ) |