← 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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
20
20
"""
21
21
 
22
22
import os
23
 
import sys
24
 
 
25
 
from bzrlib.tests.blackbox import TestCaseWithTransport
26
 
 
27
 
class TestCat(TestCaseWithTransport):
 
23
 
 
24
from bzrlib import tests
 
25
from bzrlib.transport import memory
 
26
 
 
27
 
 
28
class TestCat(tests.TestCaseWithTransport):
28
29
 
29
30
    def test_cat(self):
30
31
        tree = self.make_branch_and_tree('branch')
68
69
 
69
70
    def test_cat_different_id(self):
70
71
        """'cat' works with old and new files"""
 
72
        self.disable_missing_extensions_warning()
71
73
        tree = self.make_branch_and_tree('.')
72
74
        # the files are named after their path in the revision and
73
75
        # current trees later in the test case
126
128
        out, err = self.run_bzr_subprocess(['cat', url])
127
129
        self.assertEqual('contents of README\n', out)
128
130
 
 
131
    def test_cat_branch_revspec(self):
 
132
        wt = self.make_branch_and_tree('a')
 
133
        self.build_tree(['a/README'])
 
134
        wt.add('README')
 
135
        wt.commit('Making sure there is a basis_tree available')
 
136
        wt = self.make_branch_and_tree('b')
 
137
        os.chdir('b')
 
138
 
 
139
        out, err = self.run_bzr_subprocess(
 
140
            ['cat', '-r', 'branch:../a', 'README'])
 
141
        self.assertEqual('contents of a/README\n', out)
 
142
 
129
143
    def test_cat_filters(self):
130
144
        wt = self.make_branch_and_tree('.')
131
145
        self.build_tree(['README'])
182
196
        self.assertEqual('contents of README\n', out)
183
197
 
184
198
    def test_cat_nonexistent_branch(self):
185
 
        if sys.platform == "win32":
186
 
            location = "C:/i/do/not/exist"
187
 
        else:
188
 
            location = "/i/do/not/exist"
189
 
        self.run_bzr_error(['^bzr: ERROR: Not a branch'], ['cat', location])
 
199
        self.vfs_transport_factory = memory.MemoryServer
 
200
        self.run_bzr_error(['^bzr: ERROR: Not a branch'],
 
201
                           ['cat', self.get_url()])