← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_cat.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_cat.py
86
86
        # 'b-tree' is not present in the old tree.
87
87
        self.run_bzr_error(["^bzr: ERROR: u?'b-tree' "
88
88
                            "is not present in revision .+$"],
89
 
                           'cat b-tree --name-from-revision')
 
89
                           'cat', 'b-tree', '--name-from-revision')
90
90
 
91
91
        # get to the old file automatically
92
 
        out, err = self.run_bzr('cat d-rev')
 
92
        out, err = self.run_bzr('cat', 'd-rev')
93
93
        self.assertEqual('bar\n', out)
94
94
        self.assertEqual('', err)
95
95
 
96
 
        out, err = self.run_bzr('cat a-rev-tree --name-from-revision')
 
96
        out, err = self.run_bzr('cat', 'a-rev-tree',
 
97
                                '--name-from-revision')
97
98
        self.assertEqual('foo\n', out)
98
99
        self.assertEqual('', err)
99
100
 
100
 
        out, err = self.run_bzr('cat a-rev-tree')
 
101
        out, err = self.run_bzr('cat', 'a-rev-tree')
101
102
        self.assertEqual('baz\n', out)
102
103
        self.assertEqual('', err)
103
104
 
108
109
        wt.commit('Making sure there is a basis_tree available')
109
110
 
110
111
        url = self.get_readonly_url() + '/README'
111
 
        out, err = self.run_bzr(['cat', url])
 
112
        out, err = self.run_bzr('cat', url)
112
113
        self.assertEqual('contents of README\n', out)
113
114
 
114
115
    def test_cat_no_working_tree(self):
119
120
        wt.branch.bzrdir.destroy_workingtree()
120
121
 
121
122
        url = self.get_readonly_url() + '/README'
122
 
        out, err = self.run_bzr(['cat', url])
 
123
        out, err = self.run_bzr('cat', url)
123
124
        self.assertEqual('contents of README\n', out)
124
125