Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607 am: 316160b179 am: 3fd616f492 am: 5338649baa am: a5e4f4d296

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1392438

Change-Id: I7a428aa7cb0cdad8a449e25867e8c4bb514c2d2d

1 files changed, 6 insertions, 14 deletions

diff --git a/catapult/devil/devil/utils/lazy/weak_constant_test.py b/catapult/devil/devil/utils/lazy/weak_constant_test.py
index 643351d8..583fd07a 100644
--- a/catapult/devil/devil/utils/lazy/weak_constant_test.py
+++ b/catapult/devil/devil/utils/lazy/weak_constant_test.py
@@ -30,14 +30,11 @@ class DynamicSideEffect(object):
 
 
 class WeakConstantTest(unittest.TestCase):
-
   def testUninitialized(self):
     """Ensure that the first read calls the initializer."""
     initializer = mock.Mock(return_value='initializer called')
     test_constant = lazy.WeakConstant(initializer)
-    self.assertEquals(
-        'initializer called',
-        test_constant.read())
+    self.assertEquals('initializer called', test_constant.read())
     initializer.assert_called_once_with()
 
   def testInitialized(self):
@@ -46,23 +43,18 @@ class WeakConstantTest(unittest.TestCase):
     test_constant = lazy.WeakConstant(initializer)
     test_constant._initialized.set()
     test_constant._val = 'initializer not called'
-    self.assertEquals(
-        'initializer not called',
-        test_constant.read())
+    self.assertEquals('initializer not called', test_constant.read())
     self.assertFalse(initializer.mock_calls)  # assert not called
 
   def testFirstCallHangs(self):
     """Ensure that reading works even if the first initializer call hangs."""
-    dyn = DynamicSideEffect([
-        lambda: time.sleep(10),
-        lambda: 'second try worked!'
-    ])
+    dyn = DynamicSideEffect(
+        [lambda: time.sleep(10), lambda: 'second try worked!'])
 
     initializer = mock.Mock(side_effect=dyn)
     test_constant = lazy.WeakConstant(initializer)
-    self.assertEquals(
-        'second try worked!',
-        timeout_retry.Run(test_constant.read, 1, 1))
+    self.assertEquals('second try worked!',
+                      timeout_retry.Run(test_constant.read, 1, 1))
     initializer.assert_has_calls([mock.call(), mock.call()])