Merge lp:~lvh/divmod.org/remove-pythonpath-toxini-1269428 into lp:divmod.org

Proposed by Laurens Van Houtven
Status: Merged
Merged at revision: 2735
Proposed branch: lp:~lvh/divmod.org/remove-pythonpath-toxini-1269428
Merge into: lp:divmod.org
Diff against target: 13 lines (+1/-2)
1 file modified
Axiom/tox.ini (+1/-2)
To merge this branch: bzr merge lp:~lvh/divmod.org/remove-pythonpath-toxini-1269428
Reviewer Review Type Date Requested Status
Tristan Seligmann Needs Fixing
Review via email: mp+201781@code.launchpad.net

Description of the change

This fixes #1269428

To post a comment you must log in.
Revision history for this message
Tristan Seligmann (mithrandi) wrote :

Looks good to me. I tested it locally as well, and it seems to do the right thing now.

review: Approve
Revision history for this message
Tristan Seligmann (mithrandi) wrote :

Sorry, spoke too soon, it's still running the tests against the wrong Axiom locally, trying to figure out why now.

review: Needs Fixing
Revision history for this message
Tristan Seligmann (mithrandi) wrote :

If I do "changedir = {toxworkdir}" in tox.ini additionally, then I get the expected result (upgrader tests fail, due to missing files; I think the batch process test failure is for the same reason).

review: Needs Fixing
2736. By Laurens Van Houtven

Also change the working directory to the tox workdir to make sure we're not secretly including PYTHONPATH that way

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Axiom/tox.ini'
2--- Axiom/tox.ini 2014-01-15 10:06:02 +0000
3+++ Axiom/tox.ini 2014-01-15 19:29:50 +0000
4@@ -4,8 +4,7 @@
5 [testenv]
6 deps =
7 Twisted
8-setenv =
9- PYTHONPATH = {toxinidir}
10+changedir = {toxworkdir}
11 commands =
12 pip install -r {toxinidir}/requirements-testing.txt
13 coverage run {envdir}/bin/trial \

Subscribers

People subscribed via source and target branches