← 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: Canonical.com Patch Queue Manager
  • Date: 2010-01-12 08:03:28 UTC
  • mfrom: (4949.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100112080328-cb0tvu90uglxlrw0
(mbp) merge 2.0 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
20
20
"""
21
21
 
22
22
import os
 
23
import sys
23
24
 
24
25
from bzrlib import tests
25
26
 
127
128
        out, err = self.run_bzr_subprocess(['cat', url])
128
129
        self.assertEqual('contents of README\n', out)
129
130
 
130
 
    def test_cat_branch_revspec(self):
131
 
        wt = self.make_branch_and_tree('a')
132
 
        self.build_tree(['a/README'])
133
 
        wt.add('README')
134
 
        wt.commit('Making sure there is a basis_tree available')
135
 
        wt = self.make_branch_and_tree('b')
136
 
        os.chdir('b')
137
 
 
138
 
        out, err = self.run_bzr_subprocess(
139
 
            ['cat', '-r', 'branch:../a', 'README'])
140
 
        self.assertEqual('contents of a/README\n', out)
141
 
 
142
131
    def test_cat_filters(self):
143
132
        wt = self.make_branch_and_tree('.')
144
133
        self.build_tree(['README'])