commit de6c4564661837f50ca5aaa55c18b45ce4a9d97b
author Josip Sokcevic <sokcevic@google.com> Thu Mar 26 00:39:42 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 26 00:39:42 2020 +0000
tree 31e1d93ca5637ed5888f0ec47cb03d9d92c8e22e
parent 28be1ff85450d22df9cf709b9fa501e057306235

Fix max value for git_common threading

This fixes default value for Windows platform. Unit tests still don't
work for Windows as CTRL+C handling is not working properly.

Change-Id: I11fd33279313bfd7a2070e90164da6cf9f63696e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2121555
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

git_common.py

diff --git a/git_common.py b/git_common.py
index f8369d2..f17dde0 100644
--- a/git_common.py
+++ b/git_common.py
@@ -9,10 +9,17 @@
 from __future__ import unicode_literals
 
 import multiprocessing.pool
+import sys
+import threading
+
 from multiprocessing.pool import IMapIterator
+
 def wrapper(func):
   def wrap(self, timeout=None):
-    return func(self, timeout=timeout or 1 << 31)
+    default_timeout = (1 << 31 if sys.version_info.major == 2 else
+                       threading.TIMEOUT_MAX)
+    return func(self, timeout=timeout or default_timeout)
+
   return wrap
 IMapIterator.next = wrapper(IMapIterator.next)
 IMapIterator.__next__ = IMapIterator.next
@@ -29,10 +36,8 @@
 import setup_color
 import shutil
 import signal
-import sys
 import tempfile
 import textwrap
-import threading
 
 import subprocess2