summaryrefslogtreecommitdiff
path: root/tests/test_multithreading.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@enovance.com>2014-03-24 18:17:44 +0100
committerVictor Stinner <victor.stinner@enovance.com>2014-03-24 18:17:44 +0100
commit6d5a4749b5df9101dd5872987d3458b4d9c0df8a (patch)
tree8999a6883cdba020ff7ba7644d87e3fe9d4093e9 /tests/test_multithreading.py
parent070dd48c315b63e9ba75fc1020922222c985b194 (diff)
downloadpython-swiftclient-6d5a4749b5df9101dd5872987d3458b4d9c0df8a.tar.gz
Python 3: cast map() result to list
On Python 3, map() returns a generator, not a list. Cast explicitly the result of map() to a list to get a list on Python 2 and Python 3. The cast is useless in Python 2, but it doesn't hurt performances: it's just a unit test. Change-Id: I87486b7dbc42507a6fd7886748a2e09735b6fc5b
Diffstat (limited to 'tests/test_multithreading.py')
-rw-r--r--tests/test_multithreading.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py
index 1754f5d..c12f20c 100644
--- a/tests/test_multithreading.py
+++ b/tests/test_multithreading.py
@@ -141,7 +141,7 @@ class TestQueueFunctionManager(ThreadTestCase):
input_queue.put('go boom')
self.assertEqual(self.starting_thread_count, threading.active_count())
- error_strs = map(str, self.thread_manager.error.call_args_list)
+ error_strs = list(map(str, self.thread_manager.error.call_args_list))
self.assertEqual(1, len(error_strs))
self.assertTrue('Exception: I went boom!' in error_strs[0])
@@ -174,7 +174,7 @@ class TestQueueFunctionManager(ThreadTestCase):
input_queue.put('item%d' % i if i % 2 == 0 else 'go boom')
self.assertEqual(self.starting_thread_count, threading.active_count())
- error_strs = map(str, self.thread_manager.error.call_args_list)
+ error_strs = list(map(str, self.thread_manager.error.call_args_list))
self.assertEqual(10, len(error_strs))
self.assertTrue(all(['Exception: I went boom!' in s for s in
error_strs]))
@@ -196,7 +196,7 @@ class TestQueueFunctionManager(ThreadTestCase):
input_queue.put('item%d' % i if i % 2 == 0 else 'c boom')
self.assertEqual(self.starting_thread_count, threading.active_count())
- error_strs = map(str, self.thread_manager.error.call_args_list)
+ error_strs = list(map(str, self.thread_manager.error.call_args_list))
self.assertEqual(10, len(error_strs))
stringification = 'Client Boom: ' \
'http://192.168.22.1:80/booze 404 to much no sir!'