[Buildbot-commits] [buildbot/buildbot] af7302: Merge Expect and ExpectLogged.

Sun Jan 22 00:08:27 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: af73027c78aba2783eef5fa27db9950b7fcdb7f1
      https://github.com/buildbot/buildbot/commit/af73027c78aba2783eef5fa27db9950b7fcdb7f1
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M master/buildbot/test/fake/remotecommand.py
  M master/buildbot/test/unit/test_steps_slave.py
  M master/buildbot/test/unit/test_steps_source_bzr.py
  M master/buildbot/test/unit/test_steps_source_cvs.py
  M master/buildbot/test/unit/test_steps_source_git.py
  M master/buildbot/test/unit/test_steps_source_mercurial.py
  M master/buildbot/test/unit/test_steps_source_svn.py

  Log Message:
  -----------
  Merge Expect and ExpectLogged.

Since we merged the commands themselves, merge the expectations as well.

  Commit: 5cfb8f597d647ee9e7b984ca5a41d7d2e5f301f1
      https://github.com/buildbot/buildbot/commit/5cfb8f597d647ee9e7b984ca5a41d7d2e5f301f1
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M master/docs/developer/cls-remotecommands.rst

  Log Message:
  -----------
  Update docs to reflect merging LoggedRemoteCommand into RemoteCommand.

  Commit: b2289515c1a4a0d262984ad094db572257f5e970
      https://github.com/buildbot/buildbot/commit/b2289515c1a4a0d262984ad094db572257f5e970
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M master/CREDITS
  M master/buildbot/buildslave.py
  M master/buildbot/config.py
  M master/buildbot/db/__init__.py
  M master/buildbot/db/buildsets.py
  M master/buildbot/db/connector.py
  M master/buildbot/db/enginestrategy.py
  A master/buildbot/db/migrate/versions/018_add_sourcestampset.py
  A master/buildbot/db/migrate/versions/019_merge_schedulers_to_objects.py
  M master/buildbot/db/model.py
  M master/buildbot/db/pool.py
  M master/buildbot/db/schedulers.py
  M master/buildbot/db/sourcestamps.py
  A master/buildbot/db/sourcestampsets.py
  M master/buildbot/manhole.py
  M master/buildbot/monkeypatches/__init__.py
  A master/buildbot/monkeypatches/sqlalchemy2189.py
  A master/buildbot/monkeypatches/sqlalchemy2364.py
  M master/buildbot/process/build.py
  M master/buildbot/process/builder.py
  M master/buildbot/process/buildrequest.py
  M master/buildbot/process/buildstep.py
  M master/buildbot/schedulers/base.py
  M master/buildbot/schedulers/basic.py
  M master/buildbot/schedulers/dependent.py
  M master/buildbot/schedulers/forcesched.py
  M master/buildbot/schedulers/manager.py
  M master/buildbot/schedulers/timed.py
  M master/buildbot/schedulers/triggerable.py
  M master/buildbot/schedulers/trysched.py
  M master/buildbot/scripts/runner.py
  M master/buildbot/sourcestamp.py
  M master/buildbot/status/buildstep.py
  M master/buildbot/status/client.py
  M master/buildbot/status/mail.py
  M master/buildbot/status/master.py
  M master/buildbot/status/web/build.py
  M master/buildbot/status/web/builder.py
  M master/buildbot/status/web/waterfall.py
  M master/buildbot/status/words.py
  M master/buildbot/steps/shell.py
  M master/buildbot/steps/source/git.py
  M master/buildbot/steps/source/oldsource.py
  M master/buildbot/steps/transfer.py
  M master/buildbot/steps/trigger.py
  M master/buildbot/test/fake/fakedb.py
  M master/buildbot/test/fake/remotecommand.py
  M master/buildbot/test/integration/test_upgrade.py
  M master/buildbot/test/unit/test_config.py
  M master/buildbot/test/unit/test_db_buildrequests.py
  M master/buildbot/test/unit/test_db_builds.py
  M master/buildbot/test/unit/test_db_buildsets.py
  M master/buildbot/test/unit/test_db_changes.py
  M master/buildbot/test/unit/test_db_connector.py
  A master/buildbot/test/unit/test_db_migrate_versions_018_add_sourcestampset.py
  A master/buildbot/test/unit/test_db_migrate_versions_019_merge_schedulers_to_objects.py
  M master/buildbot/test/unit/test_db_schedulers.py
  M master/buildbot/test/unit/test_db_sourcestamps.py
  A master/buildbot/test/unit/test_db_sourcestampsets.py
  M master/buildbot/test/unit/test_master.py
  M master/buildbot/test/unit/test_process_builder.py
  M master/buildbot/test/unit/test_process_buildrequest.py
  M master/buildbot/test/unit/test_process_buildstep.py
  M master/buildbot/test/unit/test_schedulers_base.py
  M master/buildbot/test/unit/test_schedulers_basic.py
  M master/buildbot/test/unit/test_schedulers_dependent.py
  M master/buildbot/test/unit/test_schedulers_forcesched.py
  M master/buildbot/test/unit/test_schedulers_manager.py
  M master/buildbot/test/unit/test_schedulers_timed_Nightly.py
  M master/buildbot/test/unit/test_schedulers_timed_Timed.py
  M master/buildbot/test/unit/test_schedulers_triggerable.py
  M master/buildbot/test/unit/test_schedulers_trysched.py
  M master/buildbot/test/unit/test_sourcestamp.py
  M master/buildbot/test/unit/test_status_client.py
  M master/buildbot/test/unit/test_status_mail.py
  M master/buildbot/test/unit/test_status_master.py
  M master/buildbot/test/unit/test_steps_shell.py
  M master/buildbot/test/unit/test_steps_slave.py
  M master/buildbot/test/unit/test_steps_source_git.py
  M master/buildbot/test/unit/test_steps_trigger.py
  A master/buildbot/test/unit/test_util_sautils.py
  M master/buildbot/test/util/db.py
  M master/buildbot/test/util/scheduler.py
  M master/buildbot/test/util/sourcesteps.py
  M master/buildbot/test/util/steps.py
  M master/buildbot/util/__init__.py
  M master/buildbot/util/sautils.py
  M master/contrib/bitbucket_buildbot.py
  A master/contrib/fakemaster.py
  M master/docs/developer/cls-buildsteps.rst
  M master/docs/developer/database.rst
  M master/docs/manual/cfg-buildsteps.rst
  R master/docs/manual/conf.py
  M master/docs/manual/installation.rst
  M master/docs/release-notes.rst
  M slave/buildslave/test/unit/test_runprocess.py

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

* master: (69 commits)
  better name, technique for triggering exception, in buildslave.test.unit.test_runprocess.TestRunProcess.test_startCommand_exception
  remove old conf.py
  IRC: Remove some of the extraneous logging and subscriptions.
  NEWS for previous
  Fix stupid type s/release/releaseLocks/.
  Release lock held by slave, when we lose the connection to the slave.
  Git: Properly ignore errors on 'git branch -M'.
  ShellCommand.describe(): Ignore AttributeError
  Document and test MakeDirectory.
  Git: Support source-stamp patches.
  Git: Rename local branch to match remote branch name.
  Git: Remove bogus raise failure.Failure.
  Git: Use provide or default branch when cloning and fetching, rather than master.
  Sort next builds in waterfall
  just improve logging. Don't change default port
  Changed default port to connect to PBChangeListener to 9999 (from 9989 which is the 'normal' slave connection port. Added some debug logging when trying to connect to bb master
  don't use sa.Boolean
  Simplify scheduler-related DB schema
  add/fix comments in model.py
  update CREDITS from git history
  ...

  Commit: 8b84670bf02ee495d72c713f90bbe735a967fe67
      https://github.com/buildbot/buildbot/commit/8b84670bf02ee495d72c713f90bbe735a967fe67
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M master/buildbot/test/unit/test_steps_slave.py
  M master/buildbot/test/unit/test_steps_source_git.py

  Log Message:
  -----------
  update ExpectLogged->Expect to master

Compare: https://github.com/buildbot/buildbot/compare/a29bdcc...8b84670