← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Martin Pool
  • Date: 2005-09-16 09:56:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050916095623-ca0dff452934f21f
- make progress bar more tolerant of out-of-range values

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
18
18
"""Tests of status command.
19
19
 
20
20
Most of these depend on the particular formatting used.
21
 
As such they really are blackbox tests even though some of the 
22
 
tests are not using self.capture. If we add tests for the programmatic
23
 
interface later, they will be non blackbox tests.
24
21
"""
25
22
 
26
23
 
27
 
from cStringIO import StringIO
28
 
from os import mkdir
29
 
from tempfile import TemporaryFile
30
 
import codecs
31
 
 
32
 
from bzrlib.branch import Branch
33
 
from bzrlib.builtins import merge
34
 
from bzrlib.revisionspec import RevisionSpec
35
 
from bzrlib.status import show_status
36
 
from bzrlib.tests import TestCaseWithTransport
37
 
from bzrlib.workingtree import WorkingTree
38
 
 
39
 
 
40
 
class BranchStatus(TestCaseWithTransport):
 
24
from bzrlib.selftest import TestCaseInTempDir
 
25
 
 
26
class BranchStatus(TestCaseInTempDir):
41
27
    
42
28
    def test_branch_status(self): 
43
 
        """Test basic branch status"""
44
 
        wt = self.make_branch_and_tree('.')
45
 
        b = wt.branch
 
29
        """Basic 'bzr mkdir' operation"""
 
30
        from cStringIO import StringIO
 
31
        from bzrlib.status import show_status
 
32
        from bzrlib.branch import Branch
 
33
        
 
34
        b = Branch('.', init=True)
46
35
 
47
36
        # status with nothing
48
37
        tof = StringIO()
51
40
 
52
41
        tof = StringIO()
53
42
        self.build_tree(['hello.c', 'bye.c'])
54
 
        wt.add_pending_merge('pending@pending-0-0')
 
43
        b.add_pending_merge('pending@pending-0-0')
55
44
        show_status(b, to_file=tof)
56
45
        tof.seek(0)
57
46
        self.assertEquals(tof.readlines(),
62
51
                           '  pending@pending-0-0\n'
63
52
                           ])
64
53
 
65
 
    def test_branch_status_revisions(self):
66
 
        """Tests branch status with revisions"""
67
 
        wt = self.make_branch_and_tree('.')
68
 
        b = wt.branch
69
 
 
70
 
        tof = StringIO()
71
 
        self.build_tree(['hello.c', 'bye.c'])
72
 
        wt.add('hello.c')
73
 
        wt.add('bye.c')
74
 
        wt.commit('Test message')
75
 
 
76
 
        tof = StringIO()
77
 
        revs =[]
78
 
        revs.append(RevisionSpec(0))
79
 
        
80
 
        show_status(b, to_file=tof, revision=revs)
81
 
        
82
 
        tof.seek(0)
83
 
        self.assertEquals(tof.readlines(),
84
 
                          ['added:\n',
85
 
                           '  bye.c\n',
86
 
                           '  hello.c\n'])
87
 
 
88
 
        self.build_tree(['more.c'])
89
 
        wt.add('more.c')
90
 
        wt.commit('Another test message')
91
 
        
92
 
        tof = StringIO()
93
 
        revs.append(RevisionSpec(1))
94
 
        
95
 
        show_status(b, to_file=tof, revision=revs)
96
 
        
97
 
        tof.seek(0)
98
 
        self.assertEquals(tof.readlines(),
99
 
                          ['added:\n',
100
 
                           '  bye.c\n',
101
 
                           '  hello.c\n'])
102
 
 
103
 
    def status_string(self, branch):
104
 
        # use a real file rather than StringIO because it doesn't handle
105
 
        # Unicode very well.
106
 
        tof = codecs.getwriter('utf-8')(TemporaryFile())
107
 
        show_status(branch, to_file=tof)
108
 
        tof.seek(0)
109
 
        return tof.read().decode('utf-8')
110
 
 
111
 
    def test_pending(self):
112
 
        """Pending merges display works, including Unicode"""
113
 
        mkdir("./branch")
114
 
        wt = self.make_branch_and_tree('branch')
115
 
        b = wt.branch
116
 
        wt.commit("Empty commit 1")
117
 
        b_2_dir = b.bzrdir.sprout('./copy')
118
 
        b_2 = b_2_dir.open_branch()
119
 
        wt2 = b_2_dir.open_workingtree()
120
 
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
121
 
        merge(["./branch", -1], [None, None], this_dir = './copy')
122
 
        message = self.status_string(b_2)
123
 
        self.assert_(message.startswith("pending merges:\n"))
124
 
        self.assert_(message.endswith("Empty commit 2\n")) 
125
 
        wt2.commit("merged")
126
 
        # must be long to make sure we see elipsis at the end
127
 
        wt.commit("Empty commit 3 " + 
128
 
                   "blah blah blah blah " * 10)
129
 
        merge(["./branch", -1], [None, None], this_dir = './copy')
130
 
        message = self.status_string(b_2)
131
 
        self.assert_(message.startswith("pending merges:\n"))
132
 
        self.assert_("Empty commit 3" in message)
133
 
        self.assert_(message.endswith("...\n")) 
134
 
 
135
 
    def test_branch_status_specific_files(self): 
136
 
        """Tests branch status with given specific files"""
137
 
        wt = self.make_branch_and_tree('.')
138
 
        b = wt.branch
139
 
 
140
 
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
141
 
        wt.add('directory')
142
 
        wt.add('test.c')
143
 
        wt.commit('testing')
144
 
        
145
 
        tof = StringIO()
146
 
        show_status(b, to_file=tof)
147
 
        tof.seek(0)
148
 
        self.assertEquals(tof.readlines(),
149
 
                          ['unknown:\n',
150
 
                           '  bye.c\n',
151
 
                           '  dir2\n',
152
 
                           '  directory/hello.c\n'
153
 
                           ])
154
 
 
155
 
        tof = StringIO()
156
 
        show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
157
 
        tof.seek(0)
158
 
        self.assertEquals(tof.readlines(),
159
 
                          ['unknown:\n',
160
 
                           '  bye.c\n'
161
 
                           ])
162
 
        
163
 
        tof = StringIO()
164
 
        show_status(b, specific_files=['directory'], to_file=tof)
165
 
        tof.seek(0)
166
 
        self.assertEquals(tof.readlines(),
167
 
                          ['unknown:\n',
168
 
                           '  directory/hello.c\n'
169
 
                           ])
170
 
        tof = StringIO()
171
 
        show_status(b, specific_files=['dir2'], to_file=tof)
172
 
        tof.seek(0)
173
 
        self.assertEquals(tof.readlines(),
174
 
                          ['unknown:\n',
175
 
                           '  dir2\n'
176
 
                           ])