/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_cat.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
22
22
import os
23
23
import sys
24
24
 
25
 
from bzrlib.tests.blackbox import TestCaseWithTransport
26
 
 
27
 
class TestCat(TestCaseWithTransport):
 
25
from bzrlib import tests
 
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
182
184
        self.assertEqual('contents of README\n', out)
183
185
 
184
186
    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])
 
187
        self.vfs_transport_factory = tests.MemoryServer
 
188
        self.run_bzr_error(['^bzr: ERROR: Not a branch'],
 
189
                           ['cat', self.get_url()])