← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_testament.py
30
30
 
31
31
    def test_testament_command(self):
32
32
        """Testament containing a file and a directory."""
33
 
        out, err = self.run_bzr('testament --long')
 
33
        out, err = self.run_bzr('testament', '--long')
34
34
        self.assertEqualDiff(err, '')
35
35
        self.assertEqualDiff(out, REV_2_TESTAMENT)
36
36
 
37
37
    def test_testament_command_2(self):
38
38
        """Command getting short testament of previous version."""
39
 
        out, err = self.run_bzr('testament -r1')
 
39
        out, err = self.run_bzr('testament', '-r1')
40
40
        self.assertEqualDiff(err, '')
41
41
        self.assertEqualDiff(out, REV_1_SHORT)
42
42
 
43
43
    def test_testament_command_3(self):
44
44
        """Command getting short testament of previous version."""
45
 
        out, err = self.run_bzr('testament -r1 --strict')
 
45
        out, err = self.run_bzr('testament', '-r1', '--strict')
46
46
        self.assertEqualDiff(err, '')
47
47
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
48
48