summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-08-02 11:23:55 +0000
committerGerrit Code Review <review@openstack.org>2021-08-02 11:23:55 +0000
commitff4cd1ff1ea7c34ddb923530e215f6abcc3bd4a6 (patch)
treee35d5b2029eec8f6bed6665a90c417cc302fa097
parent78ba522c7f21707a1914d690f3b8fe8fecf54118 (diff)
parent0d14e7dd190a906895af74ee0e1cbc8037a3aaad (diff)
downloadhorizon-ff4cd1ff1ea7c34ddb923530e215f6abcc3bd4a6.tar.gz
Merge "Change with_data=False for swift_get_container" into stable/victoria
-rw-r--r--openstack_dashboard/api/swift.py2
-rw-r--r--openstack_dashboard/test/unit/api/test_swift.py3
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 5645db3fa..64d38f88d 100644
--- a/openstack_dashboard/test/unit/api/test_swift.py
+++ b/openstack_dashboard/test/unit/api/test_swift.py
@@ -44,7 +44,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))