From 1b9a55600fefc55cf491d25fe62c4d73eb77e234 Mon Sep 17 00:00:00 2001 From: "iannucci@chromium.org" Date: Tue, 23 Jun 2015 04:09:41 +0000 Subject: [PATCH] Fix depot_tools presubmit tests by mocking multiprocessing.cpu_count. R=thakis@chromium.org BUG=503462 Review URL: https://codereview.chromium.org/1193333012 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295795 0039d316-1c4b-4281-b951-d872f2087c98 --- tests/presubmit_unittest.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index f37bf6ca6..3bec7733c 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -7,11 +7,12 @@ # pylint: disable=E1101,E1103 +import StringIO import functools import itertools import logging +import multiprocessing import os -import StringIO import sys import time import unittest @@ -156,6 +157,10 @@ def GetPreferredTryMasters(project, change): self.mox.StubOutWithMock(presubmit.scm.SVN, 'GenerateDiff') self.mox.StubOutWithMock(presubmit.scm.GIT, 'GenerateDiff') + # On some platforms this does all sorts of undesirable system calls, so + # just permanently mock it with a lambda that returns 2 + multiprocessing.cpu_count = lambda: 2 + class PresubmitUnittest(PresubmitTestsBase): """General presubmit_support.py tests (excluding InputApi and OutputApi)."""