1 files changed, 77 insertions, 66 deletions
diff --git a/src/python/grpcio_tests/tests/unit/_thread_cleanup_test.py b/src/python/grpcio_tests/tests/unit/_thread_cleanup_test.py
index 3e4f317edc..be3522f46f 100644
--- a/src/python/grpcio_tests/tests/unit/_thread_cleanup_test.py
+++ b/src/python/grpcio_tests/tests/unit/_thread_cleanup_test.py
@@ -40,78 +40,89 @@ _EPSILON = 0.1
 
 
 def cleanup(timeout):
-  if timeout is not None:
-    time.sleep(timeout)
-  else:
-    time.sleep(_LONG_TIME)
+    if timeout is not None:
+        time.sleep(timeout)
+    else:
+        time.sleep(_LONG_TIME)
 
 
 def slow_cleanup(timeout):
-  # Don't respect timeout
-  time.sleep(_LONG_TIME)
+    # Don't respect timeout
+    time.sleep(_LONG_TIME)
 
 
 class CleanupThreadTest(unittest.TestCase):
 
-  def testTargetInvocation(self):
-    event = threading.Event()
-    def target(arg1, arg2, arg3=None):
-      self.assertEqual('arg1', arg1)
-      self.assertEqual('arg2', arg2)
-      self.assertEqual('arg3', arg3)
-      event.set()
-
-    cleanup_thread = _common.CleanupThread(behavior=lambda x: None,
-                              target=target, name='test-name',
-                              args=('arg1', 'arg2'), kwargs={'arg3': 'arg3'})
-    cleanup_thread.start()
-    cleanup_thread.join()
-    self.assertEqual(cleanup_thread.name, 'test-name')
-    self.assertTrue(event.is_set())
-
-  def testJoinNoTimeout(self):
-    cleanup_thread = _common.CleanupThread(behavior=cleanup)
-    cleanup_thread.start()
-    start_time = time.time()
-    cleanup_thread.join()
-    end_time = time.time()
-    self.assertAlmostEqual(_LONG_TIME, end_time - start_time, delta=_EPSILON)
-
-  def testJoinTimeout(self):
-    cleanup_thread = _common.CleanupThread(behavior=cleanup)
-    cleanup_thread.start()
-    start_time = time.time()
-    cleanup_thread.join(_SHORT_TIME)
-    end_time = time.time()
-    self.assertAlmostEqual(_SHORT_TIME, end_time - start_time, delta=_EPSILON)
-
-  def testJoinTimeoutSlowBehavior(self):
-    cleanup_thread = _common.CleanupThread(behavior=slow_cleanup)
-    cleanup_thread.start()
-    start_time = time.time()
-    cleanup_thread.join(_SHORT_TIME)
-    end_time = time.time()
-    self.assertAlmostEqual(_LONG_TIME, end_time - start_time, delta=_EPSILON)
-
-  def testJoinTimeoutSlowTarget(self):
-    event = threading.Event()
-    def target():
-      event.wait(_LONG_TIME)
-    cleanup_thread = _common.CleanupThread(behavior=cleanup, target=target)
-    cleanup_thread.start()
-    start_time = time.time()
-    cleanup_thread.join(_SHORT_TIME)
-    end_time = time.time()
-    self.assertAlmostEqual(_SHORT_TIME, end_time - start_time, delta=_EPSILON)
-    event.set()
-
-  def testJoinZeroTimeout(self):
-    cleanup_thread = _common.CleanupThread(behavior=cleanup)
-    cleanup_thread.start()
-    start_time = time.time()
-    cleanup_thread.join(0)
-    end_time = time.time()
-    self.assertAlmostEqual(0, end_time - start_time, delta=_EPSILON)
+    def testTargetInvocation(self):
+        event = threading.Event()
+
+        def target(arg1, arg2, arg3=None):
+            self.assertEqual('arg1', arg1)
+            self.assertEqual('arg2', arg2)
+            self.assertEqual('arg3', arg3)
+            event.set()
+
+        cleanup_thread = _common.CleanupThread(
+            behavior=lambda x: None,
+            target=target,
+            name='test-name',
+            args=('arg1', 'arg2'),
+            kwargs={'arg3': 'arg3'})
+        cleanup_thread.start()
+        cleanup_thread.join()
+        self.assertEqual(cleanup_thread.name, 'test-name')
+        self.assertTrue(event.is_set())
+
+    def testJoinNoTimeout(self):
+        cleanup_thread = _common.CleanupThread(behavior=cleanup)
+        cleanup_thread.start()
+        start_time = time.time()
+        cleanup_thread.join()
+        end_time = time.time()
+        self.assertAlmostEqual(
+            _LONG_TIME, end_time - start_time, delta=_EPSILON)
+
+    def testJoinTimeout(self):
+        cleanup_thread = _common.CleanupThread(behavior=cleanup)
+        cleanup_thread.start()
+        start_time = time.time()
+        cleanup_thread.join(_SHORT_TIME)
+        end_time = time.time()
+        self.assertAlmostEqual(
+            _SHORT_TIME, end_time - start_time, delta=_EPSILON)
+
+    def testJoinTimeoutSlowBehavior(self):
+        cleanup_thread = _common.CleanupThread(behavior=slow_cleanup)
+        cleanup_thread.start()
+        start_time = time.time()
+        cleanup_thread.join(_SHORT_TIME)
+        end_time = time.time()
+        self.assertAlmostEqual(
+            _LONG_TIME, end_time - start_time, delta=_EPSILON)
+
+    def testJoinTimeoutSlowTarget(self):
+        event = threading.Event()
+
+        def target():
+            event.wait(_LONG_TIME)
+
+        cleanup_thread = _common.CleanupThread(behavior=cleanup, target=target)
+        cleanup_thread.start()
+        start_time = time.time()
+        cleanup_thread.join(_SHORT_TIME)
+        end_time = time.time()
+        self.assertAlmostEqual(
+            _SHORT_TIME, end_time - start_time, delta=_EPSILON)
+        event.set()
+
+    def testJoinZeroTimeout(self):
+        cleanup_thread = _common.CleanupThread(behavior=cleanup)
+        cleanup_thread.start()
+        start_time = time.time()
+        cleanup_thread.join(0)
+        end_time = time.time()
+        self.assertAlmostEqual(0, end_time - start_time, delta=_EPSILON)
+
 
 if __name__ == '__main__':
-  unittest.main(verbosity=2)
+    unittest.main(verbosity=2)