summaryrefslogtreecommitdiff
path: root/tests/unit/test_shell.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-18 10:43:08 +0000
committerGerrit Code Review <review@openstack.org>2016-03-18 10:43:09 +0000
commit39e017d807a130aa1dd0626e69f84488639fa3c5 (patch)
tree5ec0ff98ae0a049fa7c2512a4c042ad4aed61910 /tests/unit/test_shell.py
parentc4ce65f2d2ddffc1951def5be8867cd59e6b17ee (diff)
parentd2bd2f0859cde8f15c70834e892aab06cd65a064 (diff)
downloadpython-swiftclient-39e017d807a130aa1dd0626e69f84488639fa3c5.tar.gz
Merge "Initialize delete_object mock *before* creating all the threads"
Diffstat (limited to 'tests/unit/test_shell.py')
-rw-r--r--tests/unit/test_shell.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py
index 36c1593..a1105dd 100644
--- a/tests/unit/test_shell.py
+++ b/tests/unit/test_shell.py
@@ -778,6 +778,7 @@ class TestShell(unittest.TestCase):
connection.return_value.attempts = 0
argv = ["", "delete", "--all"]
connection.return_value.head_object.return_value = {}
+ connection.return_value.delete_object.return_value = None
swiftclient.shell.main(argv)
connection.return_value.delete_object.assert_has_calls([
mock.call('container', 'object', query_string=None,