From 3cc61c1f4de0fbbdf1a95014a0750c9bd055fbb9 Mon Sep 17 00:00:00 2001 From: "kalman@chromium.org" Date: Wed, 26 Mar 2014 00:13:39 +0000 Subject: Docserver: Remove the "delegate" option from the Future constructor. The pattern of Future(delegate=Gettable(callback)) was getting very common, so this replaces it with just Future(callback=callback). R=yoz@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/198053015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259410 0039d316-1c4b-4281-b951-d872f2087c98 --- .../common/extensions/docs/server2/future_test.py | 34 ++++++++++------------ 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'chrome/common/extensions/docs/server2/future_test.py') diff --git a/chrome/common/extensions/docs/server2/future_test.py b/chrome/common/extensions/docs/server2/future_test.py index 3b31a0c..94352fe 100755 --- a/chrome/common/extensions/docs/server2/future_test.py +++ b/chrome/common/extensions/docs/server2/future_test.py @@ -6,8 +6,10 @@ import traceback import unittest + from future import Future + class FutureTest(unittest.TestCase): def testNoValueOrDelegate(self): self.assertRaises(ValueError, Future) @@ -18,16 +20,12 @@ class FutureTest(unittest.TestCase): self.assertEqual(42, future.Get()) def testDelegateValue(self): - assertFalse = self.assertFalse - class delegate(object): - def __init__(self): - self._get_called = False - def Get(self): - assertFalse(self._get_called) - self._get_called = True - return 42 - - future = Future(delegate=delegate()) + called = [False,] + def callback(): + self.assertFalse(called[0]) + called[0] = True + return 42 + future = Future(callback=callback) self.assertEqual(42, future.Get()) self.assertEqual(42, future.Get()) @@ -46,14 +44,11 @@ class FutureTest(unittest.TestCase): return bar() chain = [foo, bar, baz, qux] - assertFalse = self.assertFalse - class delegate(object): - def __init__(self): - self._get_called = False - def Get(self): - assertFalse(self._get_called) - self._get_called = True - return foo() + called = [False,] + def callback(): + self.assertFalse(called[0]) + called[0] = True + return foo() fail = self.fail assertTrue = self.assertTrue @@ -66,9 +61,10 @@ class FutureTest(unittest.TestCase): stack = traceback.format_exc() assertTrue(all(stack.find(fn.__name__) != -1 for fn in chain)) - future = Future(delegate=delegate()) + future = Future(callback=callback) assert_raises_full_stack(future, FunkyException) assert_raises_full_stack(future, FunkyException) + if __name__ == '__main__': unittest.main() -- cgit v1.1