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

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

Change-Id: I01f6e9f32cc3210fbc5f6f645a77b74316ecfb3b

1 files changed, 9 insertions, 14 deletions

diff --git a/catapult/devil/devil/devil_env_test.py b/catapult/devil/devil/devil_env_test.py
index e78221a0..ee7cd8fd 100755
--- a/catapult/devil/devil/devil_env_test.py
+++ b/catapult/devil/devil/devil_env_test.py
@@ -19,12 +19,10 @@ _sys_path_after = list(sys.path)
 
 
 class DevilEnvTest(unittest.TestCase):
-
   def testSysPath(self):
     self.assertEquals(_sys_path_before, _sys_path_after)
-    self.assertEquals(
-        _sys_path_before + [devil_env.PYMOCK_PATH],
-        _sys_path_with_pymock)
+    self.assertEquals(_sys_path_before + [devil_env.PYMOCK_PATH],
+                      _sys_path_with_pymock)
 
   def testGetEnvironmentVariableConfig_configType(self):
     with mock.patch('os.environ.get',
@@ -42,20 +40,17 @@ class DevilEnvTest(unittest.TestCase):
     def mock_environment(env_var):
       return '/my/fake/adb/path' if env_var == 'ADB_PATH' else None
 
-    with mock.patch('os.environ.get',
-                    mock.Mock(side_effect=mock_environment)):
+    with mock.patch('os.environ.get', mock.Mock(side_effect=mock_environment)):
       env_config = devil_env._GetEnvironmentVariableConfig()
-    self.assertEquals(
-        {
-          'adb': {
+    self.assertEquals({
+        'adb': {
             'file_info': {
-              'linux2_x86_64': {
-                'local_paths': ['/my/fake/adb/path'],
-              },
+                'linux2_x86_64': {
+                    'local_paths': ['/my/fake/adb/path'],
+                },
             },
-          },
         },
-        env_config.get('dependencies'))
+    }, env_config.get('dependencies'))
 
 
 if __name__ == '__main__':