summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/docs/server2/future_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/extensions/docs/server2/future_test.py')
-rwxr-xr-xchrome/common/extensions/docs/server2/future_test.py34
1 files changed, 15 insertions, 19 deletions
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()