[Buildbot-commits] [buildbot/buildbot] 9255a8: unit tests on 'buildslave upgrade' command

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 9255a8219f3bde6ab1166eb1fa605f7ca1127499
      https://github.com/buildbot/buildbot/commit/9255a8219f3bde6ab1166eb1fa605f7ca1127499
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M slave/buildslave/test/unit/test_scripts_upgrade_slave.py
    M slave/buildslave/test/util/misc.py

  Log Message:
  -----------
  unit tests on 'buildslave upgrade' command

Test that older buildbot.tac files are updated correctly.
Test that modern buildbot.tac files are not changed.


  Commit: f9c9c95796158fc7212c60d25e8e05798c4c124f
      https://github.com/buildbot/buildbot/commit/f9c9c95796158fc7212c60d25e8e05798c4c124f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-05-04 (Sat, 04 May 2013)

  Changed paths:
    M slave/buildslave/test/unit/test_scripts_upgrade_slave.py
    M slave/buildslave/test/util/misc.py

  Log Message:
  -----------
  Merge branch 'slave-upgrade-tests' of git://github.com/elmirjagudin/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   ../slave/buildslave/test/unit/test_scripts_upgrade_slave.py
#	modified:   ../slave/buildslave/test/util/misc.py
#


Compare: https://github.com/buildbot/buildbot/compare/dd5fabd098b1...f9c9c9579615