[Buildbot-commits] [buildbot/buildbot] 046b2d: Merge branch 'trial_pythonpath_fix' of git://githu...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot

  Commit: 046b2db09673f59b4c85c85241f5f189ad2c67db
      https://github.com/buildbot/buildbot/commit/046b2db09673f59b4c85c85241f5f189ad2c67db
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M master/buildbot/steps/python_twisted.py
  A master/buildbot/test/unit/test_steps_python_twisted.py

  Log Message:
  -----------
  Merge branch 'trial_pythonpath_fix' of git://github.com/NateBragg/buildbot into trial_pythonpath_fix

* 'trial_pythonpath_fix' of git://github.com/NateBragg/buildbot:
  Unit test, union fix
  Fix trial step's handling of pythonpath


  Commit: 7c97db156427666174aa8f006d0dc4df062fded1
      https://github.com/buildbot/buildbot/commit/7c97db156427666174aa8f006d0dc4df062fded1
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M master/buildbot/steps/python_twisted.py
  M master/buildbot/test/unit/test_steps_python_twisted.py

  Log Message:
  -----------
  ensure that PYTHONPATH order does not change

This also updates the tests to use ExpectShell.log, and adds some more
tests.


  Commit: 22a0d692945d0442e4205f1604c6af65f15ad204
      https://github.com/buildbot/buildbot/commit/22a0d692945d0442e4205f1604c6af65f15ad204
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-25 (Mon, 25 Jul 2011)

  Changed paths:
    M master/buildbot/steps/python_twisted.py
  A master/buildbot/test/unit/test_steps_python_twisted.py

  Log Message:
  -----------
  Merge branch 'trial_pythonpath_fix'

* trial_pythonpath_fix:
  ensure that PYTHONPATH order does not change
  Unit test, union fix
  Fix trial step's handling of pythonpath


Compare: https://github.com/buildbot/buildbot/compare/407ad39...22a0d69