← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev and tree implementation tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
28
28
import sys
29
29
from tempfile import TemporaryFile
30
30
 
 
31
from bzrlib import bzrdir, errors, ignores
31
32
import bzrlib.branch
32
33
from bzrlib.builtins import merge
33
 
import bzrlib.bzrdir as bzrdir
34
 
import bzrlib.errors as errors
35
34
from bzrlib.osutils import pathjoin
36
35
from bzrlib.revisionspec import RevisionSpec
37
36
from bzrlib.status import show_tree_status
41
40
 
42
41
class BranchStatus(TestCaseWithTransport):
43
42
    
44
 
    def test_branch_status(self): 
 
43
    def test_branch_status(self):
45
44
        """Test basic branch status"""
46
45
        wt = self.make_branch_and_tree('.')
47
46
        b = wt.branch
48
47
 
 
48
        ignores._set_user_ignores(['./.bazaar'])
 
49
 
49
50
        # status with nothing
50
51
        tof = StringIO()
51
52
        show_tree_status(wt, to_file=tof)
69
70
        wt = self.make_branch_and_tree('.')
70
71
        b = wt.branch
71
72
 
 
73
        ignores._set_user_ignores(['./.bazaar'])
 
74
 
72
75
        tof = StringIO()
73
76
        self.build_tree(['hello.c', 'bye.c'])
74
77
        wt.add('hello.c')
139
142
        wt = self.make_branch_and_tree('.')
140
143
        b = wt.branch
141
144
 
 
145
        ignores._set_user_ignores(['./.bazaar'])
 
146
 
142
147
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
143
148
        wt.add('directory')
144
149
        wt.add('test.c')
199
204
class TestStatus(TestCaseWithTransport):
200
205
 
201
206
    def test_status(self):
 
207
        ignores._set_user_ignores(['./.bazaar'])
 
208
 
202
209
        self.run_bzr("init")
203
210
        self.build_tree(['hello.txt'])
204
211
        result = self.run_bzr("status")[0]