/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
915 by Martin Pool
- add simple test case for bzr status
1
# Copyright (C) 2005 by Canonical Ltd
2
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.
7
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.
12
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
18
"""Tests of status command.
19
20
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.
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.
915 by Martin Pool
- add simple test case for bzr status
24
"""
25
26
1185.33.71 by Martin Pool
Status tests include unicode character.
27
from cStringIO import StringIO
28
from os import mkdir
29
from tempfile import TemporaryFile
30
import codecs
31
1534.4.28 by Robert Collins
first cut at merge from integration.
32
from bzrlib.builtins import merge
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
33
from bzrlib.revisionspec import RevisionSpec
1185.12.27 by Aaron Bentley
Use line log for pending merges
34
from bzrlib.status import show_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.
35
from bzrlib.tests import TestCaseWithTransport
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
36
from bzrlib.workingtree import WorkingTree
37
915 by Martin Pool
- add simple test case for bzr status
38
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.
39
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
40
    
41
    def test_branch_status(self): 
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
42
        """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.
43
        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.
44
        b = wt.branch
915 by Martin Pool
- add simple test case for bzr status
45
46
        # status with nothing
47
        tof = StringIO()
48
        show_status(b, to_file=tof)
49
        self.assertEquals(tof.getvalue(), "")
50
51
        tof = StringIO()
52
        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.
53
        wt.add_pending_merge('pending@pending-0-0')
915 by Martin Pool
- add simple test case for bzr status
54
        show_status(b, to_file=tof)
55
        tof.seek(0)
56
        self.assertEquals(tof.readlines(),
57
                          ['unknown:\n',
58
                           '  bye.c\n',
59
                           '  hello.c\n',
974.1.48 by Aaron Bentley
Status command shows pending merges
60
                           'pending merges:\n',
61
                           '  pending@pending-0-0\n'
915 by Martin Pool
- add simple test case for bzr status
62
                           ])
63
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
64
    def test_branch_status_revisions(self):
65
        """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.
66
        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.
67
        b = wt.branch
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
68
69
        tof = StringIO()
70
        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.
71
        wt.add('hello.c')
72
        wt.add('bye.c')
73
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
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'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
88
        wt.add('more.c')
89
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
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
1185.12.27 by Aaron Bentley
Use line log for pending merges
102
    def status_string(self, branch):
1185.33.71 by Martin Pool
Status tests include unicode character.
103
        # use a real file rather than StringIO because it doesn't handle
104
        # Unicode very well.
105
        tof = codecs.getwriter('utf-8')(TemporaryFile())
1185.12.27 by Aaron Bentley
Use line log for pending merges
106
        show_status(branch, to_file=tof)
107
        tof.seek(0)
1185.33.71 by Martin Pool
Status tests include unicode character.
108
        return tof.read().decode('utf-8')
1185.12.27 by Aaron Bentley
Use line log for pending merges
109
110
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
111
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
112
        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.
113
        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.
114
        b = wt.branch
115
        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.
116
        b_2_dir = b.bzrdir.sprout('./copy')
117
        b_2 = b_2_dir.open_branch()
118
        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.
119
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
        message = self.status_string(b_2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
122
        self.assert_(message.startswith("pending merges:\n"))
123
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
124
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
125
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
126
        wt.commit("Empty commit 3 " + 
127
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
128
        merge(["./branch", -1], [None, None], this_dir = './copy')
129
        message = self.status_string(b_2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
130
        self.assert_(message.startswith("pending merges:\n"))
131
        self.assert_("Empty commit 3" in message)
132
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
133
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
134
    def test_branch_status_specific_files(self): 
135
        """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.
136
        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.
137
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
138
139
        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.
140
        wt.add('directory')
141
        wt.add('test.c')
142
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
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
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
176
177
1534.4.54 by Robert Collins
Merge from integration.
178
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
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)
1185.50.70 by John Arbash Meinel
Found a bug in my test_status.py cleanup
185
        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)
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
199