diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-02 13:11:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-02 13:11:51 +0000 |
| commit | f276f0226dee14f5deecb37e9fe6829b4757a3f2 (patch) | |
| tree | 5e38448e48fc34ed7b9561da3deedc9cb5c1ae02 | |
| parent | 5c68bcf099951cb3a1f4fcd1ea9bd73328960929 (diff) | |
| parent | 489ba5713d0c29e433eada217a20d45f949502dd (diff) | |
| download | horizon-f276f0226dee14f5deecb37e9fe6829b4757a3f2.tar.gz | |
Merge "Change with_data=False for swift_get_container" into stable/ussuri
| -rw-r--r-- | openstack_dashboard/api/swift.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/test/unit/api/test_swift.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openstack_dashboard/api/swift.py b/openstack_dashboard/api/swift.py index 1d289e6d7..07e81e28a 100644 --- a/openstack_dashboard/api/swift.py +++ b/openstack_dashboard/api/swift.py @@ -177,7 +177,7 @@ def swift_get_containers(request, marker=None, prefix=None): @profiler.trace @safe_swift_exception -def swift_get_container(request, container_name, with_data=True): +def swift_get_container(request, container_name, with_data=False): if with_data: headers, data = swift_api(request).get_object(container_name, "") else: diff --git a/openstack_dashboard/test/unit/api/test_swift.py b/openstack_dashboard/test/unit/api/test_swift.py index a91e0249a..66cfe2eeb 100644 --- a/openstack_dashboard/test/unit/api/test_swift.py +++ b/openstack_dashboard/test/unit/api/test_swift.py @@ -46,7 +46,8 @@ class SwiftApiTests(test.APIMockTestCase): swift_api = mock_swiftclient.return_value swift_api.get_object.return_value = (container, objects) - cont = api.swift.swift_get_container(self.request, container.name) + cont = api.swift.swift_get_container(self.request, container.name, + with_data=True) self.assertEqual(container.name, cont.name) self.assertEqual(len(objects), len(cont.data)) |