Adding custom environment variable support to presubmit_canned_checks.GetUnitTestsInDirectory

Adding custom environment variable support to presubmit_canned_checks.GetUnitTestsInDirectory

I want to run Python unit tests as part of my presubmit, and those unit tests require PYTHONPATH to be set the way it would be set when the modules they test are running.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=265998

[ghost stip (do not use), 2014-04-24 20:49:03]

https://codereview.chromium.org/250693002/diff/1/presubmit_canned_checks.py
File presubmit_canned_checks.py (right):

https://codereview.chromium.org/250693002/diff/1/presubmit_canned_checks.py#n...
presubmit_canned_checks.py:557: kwargs={'cwd': input_api.PresubmitLocalPath(),
'env': env},
what is env if you don't pass it in as a kwarg? do you want to do env = env |
os.environ.copy()

[smut, 2014-04-24 20:55:40]

https://codereview.chromium.org/250693002/diff/1/presubmit_canned_checks.py
File presubmit_canned_checks.py (right):

https://codereview.chromium.org/250693002/diff/1/presubmit_canned_checks.py#n...
presubmit_canned_checks.py:557: kwargs={'cwd': input_api.PresubmitLocalPath(),
'env': env},
On 2014/04/24 20:49:03, stip wrote:
> what is env if you don't pass it in as a kwarg? do you want to do env = env |
> os.environ.copy()

I don't want to pass os.environ.copy() by default because before I made this
change, env was not being passed to this method at all. Making os.environ.copy()
default will make every place where GetUnitTests is being used suddenly have a
potentially unexpected environment when running tests.

I've uploaded a new patch that prevents any impact on pre-existing presubmits.

[ghost stip (do not use), 2014-04-24 21:34:04]

lgtm

[smut, 2014-04-24 21:38:56]

The CQ bit was checked by smut@google.com

[commit-bot: I haz the power, 2014-04-24 21:39:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/smut@google.com/250693002/20001

[commit-bot: I haz the power, 2014-04-24 21:42:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-24 21:42:46]

Presubmit check for 250693002-20001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/subprocess2_test.py (33.53s) failed
.....a
bb
ccc
a
bb
ccc
..a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
....a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
a
bb
ccc
...F....................
======================================================================
FAIL: test_nag_timer (__main__.S2Test)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/subprocess2_test.py", line 618, in test_nag_timer
    self.assertEquals(w, expected)
AssertionError: Lists differ: ['No output for 3 seconds from... != ['No output
for 3 seconds from...

First list contains 2 additional elements.
First extra element 6:
No output for 12 seconds from command:

  ['No output for 3 seconds from command:',
   '/usr/bin/python tests/subprocess2_test.py --child --stdout --sleep_first',
   'No output for 6 seconds from command:',
   '/usr/bin/python tests/subprocess2_test.py --child --stdout --sleep_first',
   'No output for 9 seconds from command:',
-  '/usr/bin/python tests/subprocess2_test.py --child --stdout --sleep_first',
-  'No output for 12 seconds from command:',
   '/usr/bin/python tests/subprocess2_test.py --child --stdout --sleep_first']

----------------------------------------------------------------------
Ran 35 tests in 33.172s

FAILED (failures=1)


Presubmit checks took 177.1s to calculate.

[smut, 2014-04-24 21:44:27]

The CQ bit was checked by smut@google.com

[commit-bot: I haz the power, 2014-04-24 21:45:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/smut@google.com/250693002/20001

[commit-bot: I haz the power, 2014-04-24 21:47:18]

Change committed as 265998