Browse files

Add tools/lib/python/vendor/ to preproduction's PYTHONPATH

  • Loading branch information...
1 parent 69c75e7 commit ed5461a6ac689cc219f64d03b448ea73d6747939 @mozbhearsum mozbhearsum committed Aug 21, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 master/preproduction_factory.py
View
6 master/preproduction_factory.py
@@ -118,7 +118,7 @@ def test_masters(self):
env={'PATH':
WithProperties('%(topdir)s/sandbox/bin:/bin:/usr/bin'),
'PYTHONPATH':
- WithProperties('%(topdir)s:%(topdir)s/tools/lib/python'),
+ WithProperties('%(topdir)s:%(topdir)s/tools/lib/python:%(topdir)s/tools/lib/python/vendor'),
},
workdir="buildbot-configs",
))
@@ -178,7 +178,7 @@ def bbc_run_tests(self):
workdir='buildbotcustom',
command=['bash', '-c',
'exit=0; for f in test/*.py; do trial $f || exit=1; done; exit $exit'],
- env={'PYTHONPATH': WithProperties('%(topdir)s/tools/lib/python:%(topdir)s')},
+ env={'PYTHONPATH': WithProperties('%(topdir)s/tools/lib/python:%(topdir)s:%(topdir)s/tools/lib/python/vendor')},
name='buildbotcustom_tests',
flunkOnFailure=False,
))
@@ -219,7 +219,7 @@ def coverage(self, project):
WithProperties('--omit="%(topdir)s/sandbox/*,/usr/*,/tools/*,*/test/*"'),
'../sandbox/bin/nosetests'],
workdir=project,
- env={'PYTHONPATH': WithProperties('%(topdir)s/tools/lib/python')},
+ env={'PYTHONPATH': WithProperties('%(topdir)s/tools/lib/python:%(topdir)s/tools/lib/python/vendor')},
flunkOnFailure=False,
))
self.addStep(ShellCommand(

0 comments on commit ed5461a

Please sign in to comment.