~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
"""
22
22
 
23
23
 
24
 
from bzrlib.selftest import TestCaseInTempDir
 
24
from bzrlib.tests import TestCaseInTempDir
25
25
from bzrlib.revisionspec import RevisionSpec
26
26
from bzrlib.merge import merge
27
27
from cStringIO import StringIO
38
38
        from bzrlib.status import show_status
39
39
        from bzrlib.branch import Branch
40
40
        
41
 
        b = Branch.initialize('.')
 
41
        b = Branch.initialize(u'.')
42
42
 
43
43
        # status with nothing
44
44
        tof = StringIO()
61
61
    def test_branch_status_revisions(self):
62
62
        """Tests branch status with revisions"""
63
63
        
64
 
        b = Branch.initialize('.')
 
64
        b = Branch.initialize(u'.')
65
65
 
66
66
        tof = StringIO()
67
67
        self.build_tree(['hello.c', 'bye.c'])
68
 
        b.add('hello.c')
69
 
        b.add('bye.c')
 
68
        b.working_tree().add('hello.c')
 
69
        b.working_tree().add('bye.c')
70
70
        b.working_tree().commit('Test message')
71
71
 
72
72
        tof = StringIO()
82
82
                           '  hello.c\n'])
83
83
 
84
84
        self.build_tree(['more.c'])
85
 
        b.add('more.c')
 
85
        b.working_tree().add('more.c')
86
86
        b.working_tree().commit('Another test message')
87
87
        
88
88
        tof = StringIO()
129
129
        from bzrlib.status import show_status
130
130
        from bzrlib.branch import Branch
131
131
        
132
 
        b = Branch.initialize('.')
 
132
        b = Branch.initialize(u'.')
133
133
 
134
134
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
135
 
        b.add('directory')
136
 
        b.add('test.c')
 
135
        b.working_tree().add('directory')
 
136
        b.working_tree().add('test.c')
137
137
        b.working_tree().commit('testing')
138
138
        
139
139
        tof = StringIO()