~bzr-pqm/bzr/bzr.dev

1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
1
# Copyright (C) 2005, 2006 by Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
915 by Martin Pool
- add simple test case for bzr status
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
915 by Martin Pool
- add simple test case for bzr status
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
915 by Martin Pool
- add simple test case for bzr status
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests of status command.
18
19
Most of these depend on the particular formatting used.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
20
As such they really are blackbox tests even though some of the 
21
tests are not using self.capture. If we add tests for the programmatic
22
interface later, they will be non blackbox tests.
915 by Martin Pool
- add simple test case for bzr status
23
"""
24
1185.33.71 by Martin Pool
Status tests include unicode character.
25
from cStringIO import StringIO
1685.1.80 by Wouter van Heyst
more code cleanup
26
import codecs
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
27
from os import mkdir, chdir
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
28
import sys
1185.33.71 by Martin Pool
Status tests include unicode character.
29
from tempfile import TemporaryFile
30
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
31
from bzrlib import bzrdir, errors, ignores
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
32
import bzrlib.branch
1534.4.28 by Robert Collins
first cut at merge from integration.
33
from bzrlib.builtins import merge
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
34
from bzrlib.osutils import pathjoin
1948.4.29 by John Arbash Meinel
Remove a few more direct references to RevisionSpec
35
from bzrlib.revisionspec import get_revision_spec
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
36
from bzrlib.status import show_tree_status
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
37
from bzrlib.tests import TestCaseWithTransport, TestSkipped
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
38
from bzrlib.workingtree import WorkingTree
39
915 by Martin Pool
- add simple test case for bzr status
40
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
41
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
42
    
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
43
    def test_branch_status(self):
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
44
        """Test basic branch status"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
45
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
        b = wt.branch
915 by Martin Pool
- add simple test case for bzr status
47
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
48
        ignores._set_user_ignores(['./.bazaar'])
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
49
915 by Martin Pool
- add simple test case for bzr status
50
        # status with nothing
51
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
52
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
53
        self.assertEquals(tof.getvalue(), "")
54
55
        tof = StringIO()
56
        self.build_tree(['hello.c', 'bye.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
57
        wt.add_pending_merge('pending@pending-0-0')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
58
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
59
        tof.seek(0)
60
        self.assertEquals(tof.readlines(),
61
                          ['unknown:\n',
62
                           '  bye.c\n',
63
                           '  hello.c\n',
974.1.48 by Aaron Bentley
Status command shows pending merges
64
                           'pending merges:\n',
65
                           '  pending@pending-0-0\n'
915 by Martin Pool
- add simple test case for bzr status
66
                           ])
67
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
68
    def test_branch_status_revisions(self):
69
        """Tests branch status with revisions"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
70
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
71
        b = wt.branch
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
72
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
73
        ignores._set_user_ignores(['./.bazaar'])
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
74
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
75
        tof = StringIO()
76
        self.build_tree(['hello.c', 'bye.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
77
        wt.add('hello.c')
78
        wt.add('bye.c')
79
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
80
81
        tof = StringIO()
82
        revs =[]
1948.4.29 by John Arbash Meinel
Remove a few more direct references to RevisionSpec
83
        revs.append(get_revision_spec('0'))
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
84
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
85
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
86
        
87
        tof.seek(0)
88
        self.assertEquals(tof.readlines(),
89
                          ['added:\n',
90
                           '  bye.c\n',
91
                           '  hello.c\n'])
92
93
        self.build_tree(['more.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
94
        wt.add('more.c')
95
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
96
        
97
        tof = StringIO()
1948.4.29 by John Arbash Meinel
Remove a few more direct references to RevisionSpec
98
        revs.append(get_revision_spec('1'))
1551.2.12 by Aaron Bentley
whitespace fixups
99
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
100
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
101
        
102
        tof.seek(0)
103
        self.assertEquals(tof.readlines(),
104
                          ['added:\n',
105
                           '  bye.c\n',
106
                           '  hello.c\n'])
107
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
108
    def status_string(self, wt):
1185.33.71 by Martin Pool
Status tests include unicode character.
109
        # use a real file rather than StringIO because it doesn't handle
110
        # Unicode very well.
111
        tof = codecs.getwriter('utf-8')(TemporaryFile())
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
112
        show_tree_status(wt, to_file=tof)
1185.12.27 by Aaron Bentley
Use line log for pending merges
113
        tof.seek(0)
1185.33.71 by Martin Pool
Status tests include unicode character.
114
        return tof.read().decode('utf-8')
1185.12.27 by Aaron Bentley
Use line log for pending merges
115
116
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
117
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
118
        mkdir("./branch")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
119
        wt = self.make_branch_and_tree('branch')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
120
        b = wt.branch
121
        wt.commit("Empty commit 1")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
122
        b_2_dir = b.bzrdir.sprout('./copy')
123
        b_2 = b_2_dir.open_branch()
124
        wt2 = b_2_dir.open_workingtree()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
125
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
126
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
127
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
128
        self.assert_(message.startswith("pending merges:\n"))
129
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
130
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
131
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
132
        wt.commit("Empty commit 3 " + 
133
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
134
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
135
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
136
        self.assert_(message.startswith("pending merges:\n"))
137
        self.assert_("Empty commit 3" in message)
138
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
139
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
140
    def test_branch_status_specific_files(self): 
141
        """Tests branch status with given specific files"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
142
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
143
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
144
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
145
        ignores._set_user_ignores(['./.bazaar'])
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
146
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
147
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
        wt.add('directory')
149
        wt.add('test.c')
150
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
151
        
152
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
153
        show_tree_status(wt, to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
154
        tof.seek(0)
155
        self.assertEquals(tof.readlines(),
156
                          ['unknown:\n',
157
                           '  bye.c\n',
158
                           '  dir2\n',
159
                           '  directory/hello.c\n'
160
                           ])
161
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
162
        self.assertRaises(errors.PathsDoNotExist,
163
                          show_tree_status,
164
                          wt, specific_files=['bye.c','test.c','absent.c'], 
165
                          to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
166
        
167
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
168
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
169
        tof.seek(0)
170
        self.assertEquals(tof.readlines(),
171
                          ['unknown:\n',
172
                           '  directory/hello.c\n'
173
                           ])
174
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
175
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
176
        tof.seek(0)
177
        self.assertEquals(tof.readlines(),
178
                          ['unknown:\n',
179
                           '  dir2\n'
180
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
181
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
182
    def test_status_nonexistent_file(self):
183
        # files that don't exist in either the basis tree or working tree
184
        # should give an error
185
        wt = self.make_branch_and_tree('.')
186
        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
187
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
188
189
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
190
class CheckoutStatus(BranchStatus):
1551.2.12 by Aaron Bentley
whitespace fixups
191
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
192
    def setUp(self):
193
        super(CheckoutStatus, self).setUp()
194
        mkdir('codir')
195
        chdir('codir')
196
        
197
    def make_branch_and_tree(self, relpath):
198
        source = self.make_branch(pathjoin('..', relpath))
199
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
200
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
201
        return checkout.create_workingtree()
202
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
203
1534.4.54 by Robert Collins
Merge from integration.
204
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
205
206
    def test_status(self):
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
207
        ignores._set_user_ignores(['./.bazaar'])
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
208
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
209
        self.run_bzr("init")
210
        self.build_tree(['hello.txt'])
211
        result = self.run_bzr("status")[0]
212
        self.assert_("unknown:\n  hello.txt\n" in result, result)
1185.50.70 by John Arbash Meinel
Found a bug in my test_status.py cleanup
213
        self.run_bzr("add", "hello.txt")
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
214
        result = self.run_bzr("status")[0]
215
        self.assert_("added:\n  hello.txt\n" in result, result)
216
        self.run_bzr("commit", "-m", "added")
217
        result = self.run_bzr("status", "-r", "0..1")[0]
218
        self.assert_("added:\n  hello.txt\n" in result, result)
219
        self.build_tree(['world.txt'])
220
        result = self.run_bzr("status", "-r", "0")[0]
221
        self.assert_("added:\n  hello.txt\n" \
222
                     "unknown:\n  world.txt\n" in result, result)
223
224
        result2 = self.run_bzr("status", "-r", "0..")[0]
225
        self.assertEquals(result2, result)
226
227
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
228
class TestStatusEncodings(TestCaseWithTransport):
229
    
230
    def setUp(self):
231
        TestCaseWithTransport.setUp(self)
232
        self.user_encoding = bzrlib.user_encoding
233
        self.stdout = sys.stdout
234
235
    def tearDown(self):
236
        bzrlib.user_encoding = self.user_encoding
237
        sys.stdout = self.stdout
238
        TestCaseWithTransport.tearDown(self)
239
240
    def make_uncommitted_tree(self):
241
        """Build a branch with uncommitted unicode named changes in the cwd."""
242
        working_tree = self.make_branch_and_tree(u'.')
243
        filename = u'hell\u00d8'
244
        try:
245
            self.build_tree_contents([(filename, 'contents of hello')])
246
        except UnicodeEncodeError:
247
            raise TestSkipped("can't build unicode working tree in "
248
                "filesystem encoding %s" % sys.getfilesystemencoding())
249
        working_tree.add(filename)
250
        return working_tree
251
252
    def test_stdout_ascii(self):
253
        sys.stdout = StringIO()
254
        bzrlib.user_encoding = 'ascii'
255
        working_tree = self.make_uncommitted_tree()
256
        stdout, stderr = self.run_bzr("status")
257
258
        self.assertEquals(stdout, """\
259
added:
260
  hell?
261
""")
262
263
    def test_stdout_latin1(self):
264
        sys.stdout = StringIO()
265
        bzrlib.user_encoding = 'latin-1'
266
        working_tree = self.make_uncommitted_tree()
267
        stdout, stderr = self.run_bzr('status')
268
269
        self.assertEquals(stdout, u"""\
270
added:
271
  hell\u00d8
272
""".encode('latin-1'))
273