From 0fc27f6c2809abbca4927ab59d11e9a623a23f89 Mon Sep 17 00:00:00 2001
From: Chmouel Boudjnah <chmouel@enovance.com>
Date: Thu, 24 Apr 2014 10:42:36 +0200
Subject: [PATCH] Mock auth_end_time in test_shell.test_download
If we don't we are getting an error like this under py3:
TypeError: unsupported operand type(s) for /: 'float' and 'MagicMock'
Change-Id: If5a6947757297354e6b81fc45f011cc2921d609f
---
tests/test_shell.py | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/tests/test_shell.py b/tests/test_shell.py
index 5708b973..61d970da 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -172,9 +172,8 @@ class TestShell(unittest.TestCase):
mock.call(' 0')]
mock_print.assert_has_calls(calls)
- @mock.patch(BUILTIN_OPEN)
@mock.patch('swiftclient.shell.Connection')
- def test_download(self, connection, mock_open):
+ def test_download(self, connection):
connection.return_value.get_object.return_value = [
{'content-type': 'text/plain',
'etag': 'd41d8cd98f00b204e9800998ecf8427e'},
@@ -185,18 +184,23 @@ class TestShell(unittest.TestCase):
[None, [{'name': 'object'}]],
[None, []],
]
+ connection.return_value.auth_end_time = 0
connection.return_value.attempts = 0
- argv = ["", "download", "container"]
- swiftclient.shell.main(argv)
- connection.return_value.get_object.assert_called_with(
- 'container', 'object', headers={}, resp_chunk_size=65536)
+ with mock.patch(BUILTIN_OPEN) as mock_open:
+ argv = ["", "download", "container"]
+ swiftclient.shell.main(argv)
+ connection.return_value.get_object.assert_called_with(
+ 'container', 'object', headers={}, resp_chunk_size=65536)
+ mock_open.assert_called_with('object', 'wb')
# Test downloading single object
- argv = ["", "download", "container", "object"]
- swiftclient.shell.main(argv)
- connection.return_value.get_object.assert_called_with(
- 'container', 'object', headers={}, resp_chunk_size=65536)
+ with mock.patch(BUILTIN_OPEN) as mock_open:
+ argv = ["", "download", "container", "object"]
+ swiftclient.shell.main(argv)
+ connection.return_value.get_object.assert_called_with(
+ 'container', 'object', headers={}, resp_chunk_size=65536)
+ mock_open.assert_called_with('object', 'wb')
@mock.patch('swiftclient.shell.listdir')
@mock.patch('swiftclient.shell.Connection')