diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-24 06:51:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-24 06:51:27 +0000 |
commit | 37bf0ff9a12f95cc609dab4697adde140500f011 (patch) | |
tree | b1d3132d19ff9f2ecc54ef3035e2ed66283400f6 | |
parent | b9bd897639e742387ca901d0bd154363accdd7a4 (diff) | |
parent | c3bec04485ad2d9b448e79e4a8d58f59502fbaf1 (diff) | |
download | python-swiftclient-37bf0ff9a12f95cc609dab4697adde140500f011.tar.gz |
Merge "Fixed several shell tests on Python3."
-rw-r--r-- | tests/test_shell.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_shell.py b/tests/test_shell.py index b6f74f3..5708b97 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -185,6 +185,7 @@ class TestShell(unittest.TestCase): [None, [{'name': 'object'}]], [None, []], ] + connection.return_value.attempts = 0 argv = ["", "download", "container"] swiftclient.shell.main(argv) @@ -202,6 +203,7 @@ class TestShell(unittest.TestCase): def test_upload(self, connection, listdir): connection.return_value.head_object.return_value = { 'content-length': '0'} + connection.return_value.attempts = 0 argv = ["", "upload", "container", self.tmpfile] swiftclient.shell.main(argv) connection.return_value.put_object.assert_called_with( @@ -245,6 +247,7 @@ class TestShell(unittest.TestCase): [None, [{'name': 'object'}]], [None, []], ] + connection.return_value.attempts = 0 argv = ["", "delete", "--all"] connection.return_value.head_object.return_value = {} swiftclient.shell.main(argv) @@ -259,6 +262,7 @@ class TestShell(unittest.TestCase): [None, [{'name': 'object'}]], [None, []], ] + connection.return_value.attempts = 0 argv = ["", "delete", "container"] connection.return_value.head_object.return_value = {} swiftclient.shell.main(argv) @@ -271,6 +275,7 @@ class TestShell(unittest.TestCase): def test_delete_object(self, connection): argv = ["", "delete", "container", "object"] connection.return_value.head_object.return_value = {} + connection.return_value.attempts = 0 swiftclient.shell.main(argv) connection.return_value.delete_object.assert_called_with( 'container', 'object', query_string=None) |