openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fixed several shell tests on Python3."

Browse Source
This commit is contained in:
Jenkins
2014-04-24 06:51:27 +00:00
committed by Gerrit Code Review
parent b9bd897639 c3bec04485
commit 37bf0ff9a1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_shell.py
View File

@@ -185,6 +185,7 @@ class TestShell(unittest.TestCase):
[None, [{'name': 'object'}]], [None, [{'name': 'object'}]],
[None, []], [None, []],
] ]
connection.return_value.attempts = 0
argv = ["", "download", "container"] argv = ["", "download", "container"]
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
@@ -202,6 +203,7 @@ class TestShell(unittest.TestCase):
def test_upload(self, connection, listdir): def test_upload(self, connection, listdir):
connection.return_value.head_object.return_value = { connection.return_value.head_object.return_value = {
'content-length': '0'} 'content-length': '0'}
connection.return_value.attempts = 0
argv = ["", "upload", "container", self.tmpfile] argv = ["", "upload", "container", self.tmpfile]
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
connection.return_value.put_object.assert_called_with( connection.return_value.put_object.assert_called_with(
@@ -245,6 +247,7 @@ class TestShell(unittest.TestCase):
[None, [{'name': 'object'}]], [None, [{'name': 'object'}]],
[None, []], [None, []],
] ]
connection.return_value.attempts = 0
argv = ["", "delete", "--all"] argv = ["", "delete", "--all"]
connection.return_value.head_object.return_value = {} connection.return_value.head_object.return_value = {}
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
@@ -259,6 +262,7 @@ class TestShell(unittest.TestCase):
[None, [{'name': 'object'}]], [None, [{'name': 'object'}]],
[None, []], [None, []],
] ]
connection.return_value.attempts = 0
argv = ["", "delete", "container"] argv = ["", "delete", "container"]
connection.return_value.head_object.return_value = {} connection.return_value.head_object.return_value = {}
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
@@ -271,6 +275,7 @@ class TestShell(unittest.TestCase):
def test_delete_object(self, connection): def test_delete_object(self, connection):
argv = ["", "delete", "container", "object"] argv = ["", "delete", "container", "object"]
connection.return_value.head_object.return_value = {} connection.return_value.head_object.return_value = {}
connection.return_value.attempts = 0
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
connection.return_value.delete_object.assert_called_with( connection.return_value.delete_object.assert_called_with(
'container', 'object', query_string=None) 'container', 'object', query_string=None)