[Buildbot-commits] [buildbot/buildbot] fa6aee: Fix Git failures when master-side Gerrit step used

Sun Nov 17 15:49:35 UTC 2013

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: fa6aeee5c63ace8d4117d9937972905a74f8d9a4
      https://github.com/buildbot/buildbot/commit/fa6aeee5c63ace8d4117d9937972905a74f8d9a4
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M master/buildbot/steps/source/gerrit.py

  Log Message:
  -----------
  Fix Git failures when master-side Gerrit step used

The Git step fetches from the wrong branch when being notified by
Gerrit 'ref-updated' events. In that case, branch=None is passed to
Git.startVC(...), hence the resulting git-fetch call tries to fetch HEAD
instead of the desired branch.

This was likely a typo from the original author.

  Commit: c6b37bdb041cf2ba9ca614296cb2aec572e2d8ba
      https://github.com/buildbot/buildbot/commit/c6b37bdb041cf2ba9ca614296cb2aec572e2d8ba
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py

  Log Message:
  -----------
  Let rmdir timeout after self.timeout.

  Commit: 5b6db5792f371bf902be14fd4c1e9c7881c39e7a
      https://github.com/buildbot/buildbot/commit/5b6db5792f371bf902be14fd4c1e9c7881c39e7a
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_cvs.py

  Log Message:
  -----------
  Test for the timeout parameter.

  Commit: fd9f7f62e6d99dd2dd52836dfb2f2b4dbd515856
      https://github.com/buildbot/buildbot/commit/fd9f7f62e6d99dd2dd52836dfb2f2b4dbd515856
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/test/unit/test_steps_source_cvs.py

  Log Message:
  -----------
  Add timeout to cpdir

  Commit: 7157fbb1163096410c115c00825051f5e2c4571e
      https://github.com/buildbot/buildbot/commit/7157fbb1163096410c115c00825051f5e2c4571e
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_cvs.py

  Log Message:
  -----------
  Test for step.timeout instead of a fixed amount.

  Commit: 3998aa2aedc6113eb3d5f0d56efb8aaa93fcb755
      https://github.com/buildbot/buildbot/commit/3998aa2aedc6113eb3d5f0d56efb8aaa93fcb755
  Author: Nido Media <nido at foxserver.be>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/process/factory.py

  Log Message:
  -----------
  Added autoreconf to GNUAutoconf

  Commit: 870ada0944713a0e1d2075cbed2505b0dd54a27c
      https://github.com/buildbot/buildbot/commit/870ada0944713a0e1d2075cbed2505b0dd54a27c
  Author: Nido Media <nido at foxserver.be>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/docs/manual/cfg-buildfactories.rst

  Log Message:
  -----------
  documentation

  Commit: 0f868e0d786008aa6744bb7a0af59f105cf844b9
      https://github.com/buildbot/buildbot/commit/0f868e0d786008aa6744bb7a0af59f105cf844b9
  Author: Nido Media <nido at foxserver.be>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/process/factory.py

  Log Message:
  -----------
  removed docstring

  Commit: c1e3d5d994f358babedd2a7e05bbe2e06437f219
      https://github.com/buildbot/buildbot/commit/c1e3d5d994f358babedd2a7e05bbe2e06437f219
  Author: Nido Media <nido at foxserver.be>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  added release note

  Commit: c9047527d594c6fb227c6b45cc17f11e2ee39e23
      https://github.com/buildbot/buildbot/commit/c9047527d594c6fb227c6b45cc17f11e2ee39e23
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  rewrite BuildStep.startStep to use inlineCallbacks

  Commit: 134be6ba3b8e63f88b34a497c7ec7ef138765adc
      https://github.com/buildbot/buildbot/commit/134be6ba3b8e63f88b34a497c7ec7ef138765adc
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  Merge branch 'startStep-inlineCallbacks' of git://github.com/djmitche/buildbot

  Commit: 9916b9abc4b2c5a85c78ba809e76de0677907de0
      https://github.com/buildbot/buildbot/commit/9916b9abc4b2c5a85c78ba809e76de0677907de0
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    M master/buildbot/monkeypatches/servicechecks.py
    M master/buildbot/monkeypatches/testcase_patch.py
    M master/buildbot/monkeypatches/testcase_synctest.py

  Log Message:
  -----------
  Only apply monkeypatches once

Use a decorator to ensure each monkeypatch is only installed once, even
in the face of multiple integration tests that call
'monkeypatches.patch()'.  This avoids very deep recursion when running
tests repeatedly in the same interpreter.

Also, clean up the test-only monkeypatches to follow the same convention
as the production monkeypatches.

  Commit: faa8c2f6ddb3fb249885e39119502608e42d3a29
      https://github.com/buildbot/buildbot/commit/faa8c2f6ddb3fb249885e39119502608e42d3a29
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    M master/buildbot/monkeypatches/servicechecks.py
    M master/buildbot/monkeypatches/testcase_patch.py
    M master/buildbot/monkeypatches/testcase_synctest.py

  Log Message:
  -----------
  Merge branch 'patch-only-once' of git://github.com/djmitche/buildbot

+autopep8 changes

  Commit: da6108efadd2f97436d437a95ac5ebe172f0a34e
      https://github.com/buildbot/buildbot/commit/da6108efadd2f97436d437a95ac5ebe172f0a34e
  Author: Nido Media <nido at foxserver.be>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_process_factory.py

  Log Message:
  -----------
  added GNUAutoconf tests

  Commit: 9911bc71c514a5117265127709ce1af4d3e7ebc6
      https://github.com/buildbot/buildbot/commit/9911bc71c514a5117265127709ce1af4d3e7ebc6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M master/buildbot/process/factory.py
    M master/buildbot/test/unit/test_process_factory.py
    M master/docs/manual/cfg-buildfactories.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/nido/buildbot

+autopep8

  Commit: 20c2e51d74c885c560030b2c3e0765497f1a55f3
      https://github.com/buildbot/buildbot/commit/20c2e51d74c885c560030b2c3e0765497f1a55f3
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/test/unit/test_steps_source_cvs.py

  Log Message:
  -----------
  Merge branch 'source-cvs-pass-timeout-to-rmdir' of git://github.com/jpommerening/buildbot

  Commit: 93447bbef41d125cd897adbba37ce3155d62c5c1
      https://github.com/buildbot/buildbot/commit/93447bbef41d125cd897adbba37ce3155d62c5c1
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M master/buildbot/steps/source/gerrit.py

  Log Message:
  -----------
  Merge branch 'fix-gerrit-step' of git://github.com/krf/buildbot

  Commit: 0a6063c54565dc7806bedb87d74c419e59805ae0
      https://github.com/buildbot/buildbot/commit/0a6063c54565dc7806bedb87d74c419e59805ae0
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/scripts/buildbot_tac.tmpl
    M master/buildbot/scripts/runner.py
    M master/buildbot/test/unit/test_scripts_create_master.py
    M master/buildbot/test/unit/test_scripts_runner.py

  Log Message:
  -----------
  Force types on 'log-size' and 'log-count' arguments for "create-master" command

Previously these arguments were treated as string and passed as strings to
twisted.python.logfile.LogFile.fromFullPath() in buildbot.tac:

rotateLength = '10000000'
maxRotatedFiles = '10'

That led to invalid behaviour of Twisted logger - logs doesn't rotated at all.

  Commit: 034e4099fd0d5667a36ad6d605612366f06f1e93
      https://github.com/buildbot/buildbot/commit/034e4099fd0d5667a36ad6d605612366f06f1e93
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_scripts_create_master.py

  Log Message:
  -----------
  Add tests to check correct 'log-size' and 'log-count' formatting

  Commit: 37238a75fe9e9ee2aacc3268466b534febdae711
      https://github.com/buildbot/buildbot/commit/37238a75fe9e9ee2aacc3268466b534febdae711
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_scripts_create_master.py

  Log Message:
  -----------
  Check only for exception type when checking for Jinja error

Travis version on Jinja has "an integer is required" exception text,
lets not rely on it.

  Commit: e3923d992ca9eb83cd36ca771c7ba6fcb1b1dbd8
      https://github.com/buildbot/buildbot/commit/e3923d992ca9eb83cd36ca771c7ba6fcb1b1dbd8
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_scripts_runner.py

  Log Message:
  -----------
  Fix broken scripts.runner tests

  Commit: 95b0661b3fd8ea782fc4bb2341e6c429ccb418d4
      https://github.com/buildbot/buildbot/commit/95b0661b3fd8ea782fc4bb2341e6c429ccb418d4
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_scripts_runner.py

  Log Message:
  -----------
  Add test for case when "log-count" is None

  Commit: 5fb3d689c6d96ecd19ae986459ae8767b486d8a0
      https://github.com/buildbot/buildbot/commit/5fb3d689c6d96ecd19ae986459ae8767b486d8a0
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/scripts/runner.py

  Log Message:
  -----------
  Remove unused import of 're' module

Strange that pyflakes reported about this only now:
<https://travis-ci.org/vrutsky/buildbot/jobs/14080064>
and doesn't report eralier, e.g.
<https://travis-ci.org/vrutsky/buildbot/jobs/14080076>,
with same pyflakes v0.7.3...

  Commit: 549b70b3e37565e8aa5d0036283b47452e72dbec
      https://github.com/buildbot/buildbot/commit/549b70b3e37565e8aa5d0036283b47452e72dbec
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_shell.py

  Log Message:
  -----------
  Remove test_describe_fail() and add tests for describe() on custom rendarables

_describe() checks with:

   try:
       len(words)
   except AttributeError:
       # WithProperties and Property don't have __len__
       return ["???"]

if passed command is some kind of rendarable, so describe() should never fail.

But this doesn't work for renderables which are instances of new-style
classes - add failing tests for that cases.

  Commit: 484dc57b7b9c9f600dd0ea8e64d507992a14f020
      https://github.com/buildbot/buildbot/commit/484dc57b7b9c9f600dd0ea8e64d507992a14f020
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/steps/shell.py

  Log Message:
  -----------
  Fix _describe() when command is new-style class instance

  Commit: 873777c696c3565f9f0a6a2261257b3e7c118e22
      https://github.com/buildbot/buildbot/commit/873777c696c3565f9f0a6a2261257b3e7c118e22
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/steps/shell.py
    M slave/buildslave/runprocess.py

  Log Message:
  -----------
  Fix typos: "bulids", "stoppd", "superceded", "documentd"

  Commit: b8d88f0671f8a18c2e82cfafcd2f075f9218989e
      https://github.com/buildbot/buildbot/commit/b8d88f0671f8a18c2e82cfafcd2f075f9218989e
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/steps/shell.py
    M master/buildbot/test/unit/test_steps_shell.py

  Log Message:
  -----------
  Merge branch 'fix_custom_renderables_describe' of git://github.com/vrutsky/buildbot

  Commit: 2ec5af75d6db9779183536b36690d6c2e0b652cc
      https://github.com/buildbot/buildbot/commit/2ec5af75d6db9779183536b36690d6c2e0b652cc
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/scripts/buildbot_tac.tmpl
    M master/buildbot/scripts/runner.py
    M master/buildbot/test/unit/test_scripts_create_master.py
    M master/buildbot/test/unit/test_scripts_runner.py

  Log Message:
  -----------
  Merge branch 'fix_create_master_log_params' of git://github.com/vrutsky/buildbot

  Commit: 895f6277e87098dbd2129df27a82e136626b80b0
      https://github.com/buildbot/buildbot/commit/895f6277e87098dbd2129df27a82e136626b80b0
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/steps/shell.py
    M slave/buildslave/runprocess.py

  Log Message:
  -----------
  Merge branch 'fix_typos' of git://github.com/vrutsky/buildbot

  Commit: 7bb8400d6bc2105135e3099f9c0e55e14b069da0
      https://github.com/buildbot/buildbot/commit/7bb8400d6bc2105135e3099f9c0e55e14b069da0
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    M master/buildbot/monkeypatches/servicechecks.py
    M master/buildbot/monkeypatches/testcase_patch.py
    M master/buildbot/monkeypatches/testcase_synctest.py
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/process/factory.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/scripts/buildbot_tac.tmpl
    M master/buildbot/scripts/runner.py
    M master/buildbot/steps/shell.py
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/steps/source/gerrit.py
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/buildbot/test/unit/test_process_factory.py
    M master/buildbot/test/unit/test_scripts_create_master.py
    M master/buildbot/test/unit/test_scripts_runner.py
    M master/buildbot/test/unit/test_steps_shell.py
    M master/buildbot/test/unit/test_steps_source_cvs.py
    M master/buildbot/test/unit/test_steps_trigger.py
    M master/docs/manual/cfg-buildfactories.rst
    M master/docs/relnotes/index.rst
    M slave/buildslave/runprocess.py

  Log Message:
  -----------
  Merge branch 'master' into nine

Conflicts:
	master/buildbot/monkeypatches/__init__.py
	master/buildbot/process/buildstep.py
	master/buildbot/steps/source/cvs.py
	master/buildbot/test/unit/test_steps_trigger.py

Compare: https://github.com/buildbot/buildbot/compare/fa56ab594155...7bb8400d6bc2