[Buildbot-commits] [buildbot/buildbot] 41d97d: Set AbstractBuildSlave.botmaster in setServicePare...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 41d97de528c2d455805609e99d1a73bb588e3b96
      https://github.com/buildbot/buildbot/commit/41d97de528c2d455805609e99d1a73bb588e3b96
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M master/buildbot/buildslave.py
    M master/buildbot/process/botmaster.py

  Log Message:
  -----------
  Set AbstractBuildSlave.botmaster in setServiceParent rather than aftwards.

setServiceParent calls startService which assumes botmaster is already set.

Fixes #2278.


  Commit: e377a3f4cbd76ae84492200d330524aaa68f9679
      https://github.com/buildbot/buildbot/commit/e377a3f4cbd76ae84492200d330524aaa68f9679
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-04-14 (Sat, 14 Apr 2012)

  Changed paths:
    A master/buildbot/test/fake/botmaster.py
    M master/buildbot/test/unit/test_buildslave.py
    M master/buildbot/test/unit/test_process_botmaster_BotMaster.py

  Log Message:
  -----------
  Add some tests for #2278.


  Commit: b056bd417ed9eb51ae9160b85382d478fff15ab3
      https://github.com/buildbot/buildbot/commit/b056bd417ed9eb51ae9160b85382d478fff15ab3
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M master/buildbot/locks.py
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_buildslave.py
    M master/buildbot/test/unit/test_process_build.py

  Log Message:
  -----------
  Pass slave instead of slavebuilder to Real*Lock.getLock.

The function just need the slavename, and when called by BuildSlave,
with a slave lock, there isn't a slavebuilder available.


  Commit: 2a8d87621e9bcc24c0eada35d26c283b8b0ecef4
      https://github.com/buildbot/buildbot/commit/2a8d87621e9bcc24c0eada35d26c283b8b0ecef4
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M master/buildbot/buildslave.py
    M master/buildbot/locks.py
    M master/buildbot/process/botmaster.py
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    A master/buildbot/test/fake/botmaster.py
    M master/buildbot/test/unit/test_buildslave.py
    M master/buildbot/test/unit/test_process_botmaster_BotMaster.py
    M master/buildbot/test/unit/test_process_build.py

  Log Message:
  -----------
  Merge branch 'bug2278'

Conflicts:
	master/buildbot/test/unit/test_buildslave.py


Compare: https://github.com/buildbot/buildbot/compare/4613f83...2a8d876