[Buildbot-commits] [buildbot/buildbot] 20e598: Merge branch 'bug184' of git://github.com/gward/bu...

[noreply at github.com]

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

Commit: 20e598d1b45832c354d5b3b519e84d323a5383d2
    https://github.com/buildbot/buildbot/commit/20e598d1b45832c354d5b3b519e84d323a5383d2
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2011-03-27 (Sun, 27 Mar 2011)

Changed paths:
  A blockertest/Makefile
  A blockertest/README.txt
  A blockertest/master.cfg
  A blockertest/startpair
  A master/buildbot/steps/blocker.py
  A master/buildbot/test/unit/test_blocker.py

Log Message:
-----------
Merge branch 'bug184' of git://github.com/gward/buildbot

* 'bug184' of git://github.com/gward/buildbot: (41 commits)
  (#184) Blocker: add copyright message, move test, cosmetics.
  (#184) Blocker: fix unit test by removing unused imports.
  (#184) Blocker: make timeout handling a little tighter.
  (#184) Blocker: explain why trawling through the build cache is bad.
  (#184) Blocker: do not provide a default implementation of buildsMatch().
  (#184) Blocker: make test outcomes match expections again. - set flunkOnFailure true in my custom NoOp step (looks like the   upstream default changed, breaking my implicit assumption) - update test README to match current Blocker output
  (#184) Blocker: adapt to changes on current trunk (pre-0.8.4).
  (#184) Blocker: adapt test infrastructure to current trunk (pre-0.8.4). - separate buildbot and buildslave scripts - recommend use of virtualenv for running test daemons - remove manhole from test master config (doesn't work: Twisted   dependencies seem to be incorrect)
  (#184) Blocker: adjust to source reorg by moving into master/buildbot.
  (#184) Blocker: add a comment about callbacks after timeout.
  (#184) Blocker: define __str__() and __repr__(); tweak logging.
  (#184) Blocker test: tweak README.txt
  (#184) Blocker test: remove pointless constructors.
  (#184) Blocker test: add 'restart' Makefile target.
  (#184): Blocker test: replace remaining ShellCommands with custom NoOp step.
  (#184) Blocker test: replace "date" ShellCommands with custom Timestamp step.
  (#184) Blocker test: add 'reconfig' Makefile target.
  (#184): Blocker test: replace "sleep" ShellCommands with custom Delay step.
  (#184) Blocker: Trim comments from testing master.cfg.
  (#184) Blocker: flesh out testing infrastructure. This should enough for any clueful Buildbot hacker on a Unix box to systematically (not automatically!) test Blocker.
  ...

Fixes #184.


Commit: fc231641da40a0603070f86d66383314e1101589
    https://github.com/buildbot/buildbot/commit/fc231641da40a0603070f86d66383314e1101589
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2011-03-27 (Sun, 27 Mar 2011)

Changed paths:
  M master/buildbot/steps/blocker.py
  M master/buildbot/test/unit/test_blocker.py

Log Message:
-----------
rinse out pyflakes


Commit: b07ef84069011824bf0fa2217f6b1b5d4e0d56e3
    https://github.com/buildbot/buildbot/commit/b07ef84069011824bf0fa2217f6b1b5d4e0d56e3
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2011-03-27 (Sun, 27 Mar 2011)

Changed paths:
  R blockertest/Makefile
  R blockertest/README.txt
  R blockertest/master.cfg
  R blockertest/startpair
  A master/contrib/blockertest/Makefile
  A master/contrib/blockertest/README.txt
  A master/contrib/blockertest/master.cfg
  A master/contrib/blockertest/startpair

Log Message:
-----------
move blockertest to master/contrib


Compare: https://github.com/buildbot/buildbot/compare/a71d5fb...b07ef84