← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2007-09-11 14:47:02 UTC
  • mto: (2817.4.1 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20070911144702-wtrbcqhvlg9zwttk
Renamed install_hooks to start_logging_connections (as per Martin suggestion).

* bzrlib/tests/transport_util.py:
(TestCaseWithConnectionHookedTransport.start_logging_connections):
Renamed from install_hooks.


* bzrlib/tests/commands/*:
install_hooks calls updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
29
29
        wt2.pull(wt1.branch)
30
30
        wt2.commit('empty commit too')
31
31
 
32
 
        self.install_hooks()
 
32
        self.start_logging_connections()
33
33
 
34
34
        cmd = cmd_merge()
35
35
        # We don't care about the ouput but 'outf' should be defined