← 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: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
19
19
"""Black-box tests for bzr cat.
74
74
        # a-rev-tree is special because it appears in both the revision
75
75
        # tree and the working tree
76
76
        self.build_tree_contents([('a-rev-tree', 'foo\n'),
77
 
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n')])
 
77
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n'), ('e-rev', 'qux\n')])
78
78
        tree.lock_write()
79
79
        try:
80
 
            tree.add(['a-rev-tree', 'c-rev', 'd-rev'])
81
 
            tree.commit('add test files')
82
 
            # remove currently uses self._write_inventory - 
 
80
            tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
 
81
            tree.commit('add test files', rev_id='first')
 
82
            # remove currently uses self._write_inventory -
83
83
            # work around that for now.
84
84
            tree.flush()
85
85
            tree.remove(['d-rev'])
86
86
            tree.rename_one('a-rev-tree', 'b-tree')
87
87
            tree.rename_one('c-rev', 'a-rev-tree')
 
88
            tree.rename_one('e-rev', 'old-rev')
 
89
            self.build_tree_contents([('e-rev', 'new\n')])
 
90
            tree.add(['e-rev'])
88
91
        finally:
89
92
            # calling bzr as another process require free lock on win32
90
93
            tree.unlock()
108
111
        self.assertEqual('baz\n', out)
109
112
        self.assertEqual('', err)
110
113
 
 
114
        # the actual file-id for e-rev doesn't exist in the old tree
 
115
        out, err = self.run_bzr_subprocess('cat e-rev -rrevid:first')
 
116
        self.assertEqual('qux\n', out)
 
117
        self.assertEqual('', err)
 
118
 
111
119
    def test_remote_cat(self):
112
120
        wt = self.make_branch_and_tree('.')
113
121
        self.build_tree(['README'])
118
126
        out, err = self.run_bzr_subprocess(['cat', url])
119
127
        self.assertEqual('contents of README\n', out)
120
128
 
 
129
    def test_cat_filters(self):
 
130
        wt = self.make_branch_and_tree('.')
 
131
        self.build_tree(['README'])
 
132
        wt.add('README')
 
133
        wt.commit('Making sure there is a basis_tree available')
 
134
        url = self.get_readonly_url() + '/README'
 
135
 
 
136
        # Test unfiltered output
 
137
        out, err = self.run_bzr_subprocess(['cat', url])
 
138
        self.assertEqual('contents of README\n', out)
 
139
 
 
140
        # Test --filters option is legal but has no impact if no filters
 
141
        out, err = self.run_bzr_subprocess(['cat', '--filters', url])
 
142
        self.assertEqual('contents of README\n', out)
 
143
 
 
144
    def test_cat_filters_applied(self):
 
145
        # Test filtering applied to output. This is tricky to do in a
 
146
        # subprocess because we really need to patch in a plugin that
 
147
        # registers the filters. Instead, we patch in a custom
 
148
        # filter_stack and use run_bzr() ...
 
149
        from cStringIO import StringIO
 
150
        from bzrlib.commands import run_bzr
 
151
        from bzrlib.tests.test_filters import _stack_2
 
152
        from bzrlib.trace import mutter
 
153
        from bzrlib.tree import Tree
 
154
        wt = self.make_branch_and_tree('.')
 
155
        self.build_tree_contents([
 
156
            ('README', "junk\nline 1 of README\nline 2 of README\n"),
 
157
            ])
 
158
        wt.add('README')
 
159
        wt.commit('Making sure there is a basis_tree available')
 
160
        url = self.get_readonly_url() + '/README'
 
161
        real_content_filter_stack = Tree._content_filter_stack
 
162
        def _custom_content_filter_stack(tree, path=None, file_id=None):
 
163
            return _stack_2
 
164
        Tree._content_filter_stack = _custom_content_filter_stack
 
165
        try:
 
166
            out, err = self.run_bzr(['cat', url, '--filters'])
 
167
            # The filter stack will remove the first line and swapcase the rest
 
168
            self.assertEqual('LINE 1 OF readme\nLINE 2 OF readme\n', out)
 
169
            self.assertEqual('', err)
 
170
        finally:
 
171
            Tree._content_filter_stack = real_content_filter_stack
 
172
 
121
173
    def test_cat_no_working_tree(self):
122
174
        wt = self.make_branch_and_tree('.')
123
175
        self.build_tree(['README'])