Ubuntu One Client

Merge lp:~brian.curtin/ubuntuone-client/pythonpath-jenkins into lp:ubuntuone-client

  1. pythonpath-jenkins
  2. Merge into trunk
Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: 1228
Merged at revision: 1228
Proposed branch: lp:~brian.curtin/ubuntuone-client/pythonpath-jenkins
Merge into: lp:ubuntuone-client
Diff against target: 12 lines (+1/-1)
1 file modified
run-tests.bat (+1/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-client/pythonpath-jenkins
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Review via email: mp+102879@code.launchpad.net

Commit message

- Prepend existing PYTHONPATH so tests work on Jenkins, which sets its own.

Description of the change

Prepend existing PYTHONPATH so tests work on Jenkins, which sets its own.

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-tests.bat'
2--- run-tests.bat 2012-04-18 17:20:48 +0000
3+++ run-tests.bat 2012-04-20 15:11:32 +0000
4@@ -29,7 +29,7 @@
5
6 SET PYTHONEXEPATH=""
7
8-set PYTHONPATH=..\ubuntu-sso-client;.
9+set PYTHONPATH=%PYTHONPATH%;..\ubuntu-sso-client;.
10
11 ECHO Checking for Python on the path
12 :: Look for Python from buildout

Subscribers

People subscribed via source and target branches