← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
199
199
        self.vfs_transport_factory = memory.MemoryServer
200
200
        self.run_bzr_error(['^bzr: ERROR: Not a branch'],
201
201
                           ['cat', self.get_url()])
 
202
 
 
203
    def test_cat_directory(self):
 
204
        wt = self.make_branch_and_tree('a')
 
205
        self.build_tree(['a/README'])
 
206
        wt.add('README')
 
207
        wt.commit('Making sure there is a basis_tree available')
 
208
 
 
209
        out, err = self.run_bzr_subprocess(['cat', '--directory=a', 'README'])
 
210
        self.assertEqual('contents of a/README\n', out)
 
211
 
 
212
    def test_cat_remote_directory(self):
 
213
        wt = self.make_branch_and_tree('a')
 
214
        self.build_tree(['a/README'])
 
215
        wt.add('README')
 
216
        wt.commit('Making sure there is a basis_tree available')
 
217
 
 
218
        url = self.get_readonly_url() + '/a'
 
219
        out, err = self.run_bzr_subprocess(['cat', '-d', url, 'README'])
 
220
        self.assertEqual('contents of a/README\n', out)