~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testtestament.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
    def setUp(self):
36
36
        super(TestamentTests, self).setUp()
37
37
        b = self.b = Branch.initialize('.')
 
38
        b.nick = "test branch"
38
39
        b.working_tree().commit(message='initial null commit',
39
40
                 committer='test@user',
40
41
                 timestamp=1129025423, # 'Tue Oct 11 20:10:23 2005'
136
137
message:
137
138
  initial null commit
138
139
inventory:
 
140
properties:
 
141
  branch-nick:
 
142
    test branch
139
143
"""
140
144
 
141
145
REV_1_SHORT = """\
159
163
  file hello hello-id 34dd0ac19a24bf80c4d33b5c8960196e8d8d1f73
160
164
  directory src src-id
161
165
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24
 
166
properties:
 
167
  branch-nick:
 
168
    test branch
162
169
"""
163
170
 
164
171
 
184
191
  directory src src-id
185
192
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24
186
193
properties:
 
194
  branch-nick:
 
195
    test branch
187
196
  flavor:
188
197
    sour cherry
189
198
    cream cheese
207
216
  symlink link link-id wibble/linktarget
208
217
  directory src src-id
209
218
  file src/foo.c foo.c-id a2a049c20f908ae31b231d98779eb63c66448f24
 
219
properties:
 
220
  branch-nick:
 
221
    test branch
210
222
"""