~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_hooks.py

  • Committer: Martin Packman
  • Date: 2011-11-11 12:08:56 UTC
  • mfrom: (6015.44.5 2.4)
  • mto: This revision was merged to the branch mainline in revision 6257.
  • Revision ID: martin.packman@canonical.com-20111111120856-q9qih7zog2rlsihq
Merge 2.4 to pick up fix for unprintable RetryWithNewPacks

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for commands related to hooks"""
18
18
 
25
25
    def _check_hooks_output(self, command_output, hooks):
26
26
        for hook_type in Branch.hooks:
27
27
            s = "\n  ".join(hooks.get(hook_type, ["<no hooks installed>"]))
28
 
            self.assert_("%s:\n  %s" % (hook_type, s) in command_output)
 
28
            self.assert_("%s:\n    %s" % (hook_type, s) in command_output)
29
29
 
30
30
    def test_hooks_with_no_hooks(self):
31
31
        self.make_branch('.')
50
50
        self._check_hooks_output(out, {'set_rh': [name]})
51
51
 
52
52
    def test_hooks_no_branch(self):
53
 
        self.run_bzr('hooks', retcode=3)
 
53
        self.run_bzr('hooks')