← 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

  • Committer: Robert Collins
  • Date: 2006-02-15 08:11:37 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060215081137-4c27377517e96dd1
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.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.
21
24
"""
22
25
 
23
26
 
24
 
from bzrlib.selftest import TestCaseInTempDir
 
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
25
33
from bzrlib.revisionspec import RevisionSpec
26
 
from bzrlib.merge import merge
27
 
from cStringIO import StringIO
28
34
from bzrlib.status import show_status
29
 
from bzrlib.branch import Branch
30
 
from os import mkdir
31
 
from bzrlib.clone import copy_branch
32
 
 
33
 
class BranchStatus(TestCaseInTempDir):
 
35
from bzrlib.tests import TestCaseWithTransport
 
36
from bzrlib.workingtree import WorkingTree
 
37
 
 
38
 
 
39
class BranchStatus(TestCaseWithTransport):
34
40
    
35
41
    def test_branch_status(self): 
36
42
        """Test basic branch status"""
37
 
        from cStringIO import StringIO
38
 
        from bzrlib.status import show_status
39
 
        from bzrlib.branch import Branch
40
 
        
41
 
        b = Branch.initialize('.')
 
43
        wt = self.make_branch_and_tree('.')
 
44
        b = wt.branch
42
45
 
43
46
        # status with nothing
44
47
        tof = StringIO()
47
50
 
48
51
        tof = StringIO()
49
52
        self.build_tree(['hello.c', 'bye.c'])
50
 
        b.working_tree().add_pending_merge('pending@pending-0-0')
 
53
        wt.add_pending_merge('pending@pending-0-0')
51
54
        show_status(b, to_file=tof)
52
55
        tof.seek(0)
53
56
        self.assertEquals(tof.readlines(),
60
63
 
61
64
    def test_branch_status_revisions(self):
62
65
        """Tests branch status with revisions"""
63
 
        
64
 
        b = Branch.initialize('.')
 
66
        wt = self.make_branch_and_tree('.')
 
67
        b = wt.branch
65
68
 
66
69
        tof = StringIO()
67
70
        self.build_tree(['hello.c', 'bye.c'])
68
 
        b.add('hello.c')
69
 
        b.add('bye.c')
70
 
        b.working_tree().commit('Test message')
 
71
        wt.add('hello.c')
 
72
        wt.add('bye.c')
 
73
        wt.commit('Test message')
71
74
 
72
75
        tof = StringIO()
73
76
        revs =[]
82
85
                           '  hello.c\n'])
83
86
 
84
87
        self.build_tree(['more.c'])
85
 
        b.add('more.c')
86
 
        b.working_tree().commit('Another test message')
 
88
        wt.add('more.c')
 
89
        wt.commit('Another test message')
87
90
        
88
91
        tof = StringIO()
89
92
        revs.append(RevisionSpec(1))
97
100
                           '  hello.c\n'])
98
101
 
99
102
    def status_string(self, branch):
100
 
        tof = StringIO()
 
103
        # use a real file rather than StringIO because it doesn't handle
 
104
        # Unicode very well.
 
105
        tof = codecs.getwriter('utf-8')(TemporaryFile())
101
106
        show_status(branch, to_file=tof)
102
107
        tof.seek(0)
103
 
        return tof.getvalue()
 
108
        return tof.read().decode('utf-8')
104
109
 
105
110
    def test_pending(self):
106
 
        """Pending merges display works"""
 
111
        """Pending merges display works, including Unicode"""
107
112
        mkdir("./branch")
108
 
        b = Branch.initialize('./branch')
109
 
        b.working_tree().commit("Empty commit 1")
110
 
        b_2 = copy_branch(b, './copy')
111
 
        b.working_tree().commit("Empty commit 2")
 
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")
112
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
113
121
        message = self.status_string(b_2)
114
122
        self.assert_(message.startswith("pending merges:\n"))
115
123
        self.assert_(message.endswith("Empty commit 2\n")) 
116
 
        b_2.working_tree().commit("merged")
 
124
        wt2.commit("merged")
117
125
        # must be long to make sure we see elipsis at the end
118
 
        b.working_tree().commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
119
 
                 " blah blah blah blah blah blah bleh")
 
126
        wt.commit("Empty commit 3 " + 
 
127
                   "blah blah blah blah " * 10)
120
128
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
129
        message = self.status_string(b_2)
122
130
        self.assert_(message.startswith("pending merges:\n"))
125
133
 
126
134
    def test_branch_status_specific_files(self): 
127
135
        """Tests branch status with given specific files"""
128
 
        from cStringIO import StringIO
129
 
        from bzrlib.status import show_status
130
 
        from bzrlib.branch import Branch
131
 
        
132
 
        b = Branch.initialize('.')
 
136
        wt = self.make_branch_and_tree('.')
 
137
        b = wt.branch
133
138
 
134
139
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
135
 
        b.add('directory')
136
 
        b.add('test.c')
137
 
        b.working_tree().commit('testing')
 
140
        wt.add('directory')
 
141
        wt.add('test.c')
 
142
        wt.commit('testing')
138
143
        
139
144
        tof = StringIO()
140
145
        show_status(b, to_file=tof)
168
173
                          ['unknown:\n',
169
174
                           '  dir2\n'
170
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
 
 
199