~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2006-02-17 04:17:09 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060217041709-7251eb701f69ca7e
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.
21
24
"""
22
25
 
23
26
 
24
 
from bzrlib.selftest import InTempDir
25
 
 
26
 
class BranchStatus(InTempDir):
 
27
from cStringIO import StringIO
 
28
from os import mkdir
 
29
from tempfile import TemporaryFile
 
30
import codecs
 
31
 
 
32
from bzrlib.builtins import merge
 
33
from bzrlib.revisionspec import RevisionSpec
 
34
from bzrlib.status import show_status
 
35
from bzrlib.tests import TestCaseWithTransport
 
36
from bzrlib.workingtree import WorkingTree
 
37
 
 
38
 
 
39
class BranchStatus(TestCaseWithTransport):
27
40
    
28
41
    def test_branch_status(self): 
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)
 
42
        """Test basic branch status"""
 
43
        wt = self.make_branch_and_tree('.')
 
44
        b = wt.branch
35
45
 
36
46
        # status with nothing
37
47
        tof = StringIO()
40
50
 
41
51
        tof = StringIO()
42
52
        self.build_tree(['hello.c', 'bye.c'])
 
53
        wt.add_pending_merge('pending@pending-0-0')
43
54
        show_status(b, to_file=tof)
44
55
        tof.seek(0)
45
56
        self.assertEquals(tof.readlines(),
46
57
                          ['unknown:\n',
47
58
                           '  bye.c\n',
48
59
                           '  hello.c\n',
49
 
                           ])
 
60
                           'pending merges:\n',
 
61
                           '  pending@pending-0-0\n'
 
62
                           ])
 
63
 
 
64
    def test_branch_status_revisions(self):
 
65
        """Tests branch status with revisions"""
 
66
        wt = self.make_branch_and_tree('.')
 
67
        b = wt.branch
 
68
 
 
69
        tof = StringIO()
 
70
        self.build_tree(['hello.c', 'bye.c'])
 
71
        wt.add('hello.c')
 
72
        wt.add('bye.c')
 
73
        wt.commit('Test message')
 
74
 
 
75
        tof = StringIO()
 
76
        revs =[]
 
77
        revs.append(RevisionSpec(0))
 
78
        
 
79
        show_status(b, to_file=tof, revision=revs)
 
80
        
 
81
        tof.seek(0)
 
82
        self.assertEquals(tof.readlines(),
 
83
                          ['added:\n',
 
84
                           '  bye.c\n',
 
85
                           '  hello.c\n'])
 
86
 
 
87
        self.build_tree(['more.c'])
 
88
        wt.add('more.c')
 
89
        wt.commit('Another test message')
 
90
        
 
91
        tof = StringIO()
 
92
        revs.append(RevisionSpec(1))
 
93
        
 
94
        show_status(b, to_file=tof, revision=revs)
 
95
        
 
96
        tof.seek(0)
 
97
        self.assertEquals(tof.readlines(),
 
98
                          ['added:\n',
 
99
                           '  bye.c\n',
 
100
                           '  hello.c\n'])
 
101
 
 
102
    def status_string(self, branch):
 
103
        # use a real file rather than StringIO because it doesn't handle
 
104
        # Unicode very well.
 
105
        tof = codecs.getwriter('utf-8')(TemporaryFile())
 
106
        show_status(branch, to_file=tof)
 
107
        tof.seek(0)
 
108
        return tof.read().decode('utf-8')
 
109
 
 
110
    def test_pending(self):
 
111
        """Pending merges display works, including Unicode"""
 
112
        mkdir("./branch")
 
113
        wt = self.make_branch_and_tree('branch')
 
114
        b = wt.branch
 
115
        wt.commit("Empty commit 1")
 
116
        b_2_dir = b.bzrdir.sprout('./copy')
 
117
        b_2 = b_2_dir.open_branch()
 
118
        wt2 = b_2_dir.open_workingtree()
 
119
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
 
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
121
        message = self.status_string(b_2)
 
122
        self.assert_(message.startswith("pending merges:\n"))
 
123
        self.assert_(message.endswith("Empty commit 2\n")) 
 
124
        wt2.commit("merged")
 
125
        # must be long to make sure we see elipsis at the end
 
126
        wt.commit("Empty commit 3 " + 
 
127
                   "blah blah blah blah " * 10)
 
128
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
129
        message = self.status_string(b_2)
 
130
        self.assert_(message.startswith("pending merges:\n"))
 
131
        self.assert_("Empty commit 3" in message)
 
132
        self.assert_(message.endswith("...\n")) 
 
133
 
 
134
    def test_branch_status_specific_files(self): 
 
135
        """Tests branch status with given specific files"""
 
136
        wt = self.make_branch_and_tree('.')
 
137
        b = wt.branch
 
138
 
 
139
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
 
140
        wt.add('directory')
 
141
        wt.add('test.c')
 
142
        wt.commit('testing')
 
143
        
 
144
        tof = StringIO()
 
145
        show_status(b, to_file=tof)
 
146
        tof.seek(0)
 
147
        self.assertEquals(tof.readlines(),
 
148
                          ['unknown:\n',
 
149
                           '  bye.c\n',
 
150
                           '  dir2\n',
 
151
                           '  directory/hello.c\n'
 
152
                           ])
 
153
 
 
154
        tof = StringIO()
 
155
        show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
 
156
        tof.seek(0)
 
157
        self.assertEquals(tof.readlines(),
 
158
                          ['unknown:\n',
 
159
                           '  bye.c\n'
 
160
                           ])
 
161
        
 
162
        tof = StringIO()
 
163
        show_status(b, specific_files=['directory'], to_file=tof)
 
164
        tof.seek(0)
 
165
        self.assertEquals(tof.readlines(),
 
166
                          ['unknown:\n',
 
167
                           '  directory/hello.c\n'
 
168
                           ])
 
169
        tof = StringIO()
 
170
        show_status(b, specific_files=['dir2'], to_file=tof)
 
171
        tof.seek(0)
 
172
        self.assertEquals(tof.readlines(),
 
173
                          ['unknown:\n',
 
174
                           '  dir2\n'
 
175
                           ])
 
176
 
 
177
 
 
178
class TestStatus(TestCaseWithTransport):
 
179
 
 
180
    def test_status(self):
 
181
        self.run_bzr("init")
 
182
        self.build_tree(['hello.txt'])
 
183
        result = self.run_bzr("status")[0]
 
184
        self.assert_("unknown:\n  hello.txt\n" in result, result)
 
185
        self.run_bzr("add", "hello.txt")
 
186
        result = self.run_bzr("status")[0]
 
187
        self.assert_("added:\n  hello.txt\n" in result, result)
 
188
        self.run_bzr("commit", "-m", "added")
 
189
        result = self.run_bzr("status", "-r", "0..1")[0]
 
190
        self.assert_("added:\n  hello.txt\n" in result, result)
 
191
        self.build_tree(['world.txt'])
 
192
        result = self.run_bzr("status", "-r", "0")[0]
 
193
        self.assert_("added:\n  hello.txt\n" \
 
194
                     "unknown:\n  world.txt\n" in result, result)
 
195
 
 
196
        result2 = self.run_bzr("status", "-r", "0..")[0]
 
197
        self.assertEquals(result2, result)
 
198
 
50
199