Bazaar

Merge lp://staging/~mbp/bzr/trivial-old into lp://staging/bzr/2.0

  1. trivial-old
  2. Merge into 2.0
Proposed by Martin Pool
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~mbp/bzr/trivial-old
Merge into: lp://staging/bzr/2.0
Diff against target: 600 lines
To merge this branch: bzr merge lp://staging/~mbp/bzr/trivial-old
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+10501@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

Trivial fix for the IndexError in presenting <https://bugs.edge.launchpad.net/bzr/+bug/416550>

Tested interactively with 'serve -p 1'

Revision history for this message
Robert Collins (lifeless) wrote :

I'd like a test in test_errors for that, showing the sort of data we were seeing
with that, I'm +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-08-22 05:05:42 +0000
3+++ NEWS 2009-08-25 10:35:25 +0000
4@@ -36,6 +36,12 @@
5 raised by newer versions of pycurl.
6 (Vincent Ladeuil, #306264)
7
8+* Fix a test failure on karmic by making a locale test more robust.
9+ (Vincent Ladeuil, #413514)
10+
11+* Fix IndexError printing CannotBindAddress errors.
12+ (Martin Pool, #286871)
13+
14 Improvements
15 ************
16
17@@ -50,6 +56,9 @@
18 ``bazaar.conf``.
19 (Martin Pool, Robert Collins, #389328)
20
21+* ``bzr push`` locally on windows will no longer give a locking error with
22+ dirstate based formats. (Robert Collins)
23+
24 Documentation
25 *************
26
27
28=== modified file 'bzrlib/errors.py'
29--- bzrlib/errors.py 2009-08-14 09:31:37 +0000
30+++ bzrlib/errors.py 2009-08-25 10:35:25 +0000
31@@ -2920,8 +2920,9 @@
32 _fmt = 'Cannot bind address "%(host)s:%(port)i": %(orig_error)s.'
33
34 def __init__(self, host, port, orig_error):
35+ # nb: in python2.4 socket.error doesn't have a useful repr
36 BzrError.__init__(self, host=host, port=port,
37- orig_error=orig_error[1])
38+ orig_error=repr(orig_error.args))
39
40
41 class UnknownRules(BzrError):
42
43=== modified file 'bzrlib/merge.py'
44--- bzrlib/merge.py 2009-07-02 13:07:14 +0000
45+++ bzrlib/merge.py 2009-08-25 10:35:25 +0000
46@@ -64,8 +64,12 @@
47
48
49 def transform_tree(from_tree, to_tree, interesting_ids=None):
50- merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
51- interesting_ids=interesting_ids, this_tree=from_tree)
52+ from_tree.lock_tree_write()
53+ try:
54+ merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True,
55+ interesting_ids=interesting_ids, this_tree=from_tree)
56+ finally:
57+ from_tree.unlock()
58
59
60 class Merger(object):
61
62=== modified file 'bzrlib/tests/blackbox/test_non_ascii.py'
63--- bzrlib/tests/blackbox/test_non_ascii.py 2009-07-31 17:53:02 +0000
64+++ bzrlib/tests/blackbox/test_non_ascii.py 2009-08-25 10:35:25 +0000
65@@ -287,7 +287,6 @@
66 # the files around as much.
67 # Note that the tests don't actually fail, but if we don't set this
68 # flag, we end up getting "Lock was not Unlocked" warnings
69- self.thisFailsStrictLockCheck() # clone?
70
71 dirname = self.info['directory']
72 self.run_bzr_decode(['push', dirname])
73
74=== modified file 'bzrlib/tests/blackbox/test_push.py'
75--- bzrlib/tests/blackbox/test_push.py 2009-07-31 17:53:02 +0000
76+++ bzrlib/tests/blackbox/test_push.py 2009-08-25 10:35:25 +0000
77@@ -134,7 +134,6 @@
78
79 def test_push_without_tree(self):
80 # bzr push from a branch that does not have a checkout should work.
81- self.thisFailsStrictLockCheck()
82 b = self.make_branch('.')
83 out, err = self.run_bzr('push pushed-location')
84 self.assertEqual('', out)
85@@ -146,7 +145,6 @@
86 # bzr push of a branch with revisions to a new location
87 # should print the number of revisions equal to the length of the
88 # local branch.
89- self.thisFailsStrictLockCheck()
90 t = self.make_branch_and_tree('tree')
91 self.build_tree(['tree/file'])
92 t.add('file')
93@@ -157,7 +155,6 @@
94
95 def test_push_only_pushes_history(self):
96 # Knit branches should only push the history for the current revision.
97- self.thisFailsStrictLockCheck()
98 format = bzrdir.BzrDirMetaFormat1()
99 format.repository_format = knitrepo.RepositoryFormatKnit1()
100 shared_repo = self.make_repository('repo', format=format, shared=True)
101@@ -195,7 +192,6 @@
102 self.assertTrue(pushed_repo.has_revision('b-1'))
103
104 def test_push_funky_id(self):
105- self.thisFailsStrictLockCheck()
106 t = self.make_branch_and_tree('tree')
107 self.build_tree(['tree/filename'])
108 t.add('filename', 'funky-chars<>%&;"\'')
109@@ -203,7 +199,6 @@
110 self.run_bzr('push -d tree new-tree')
111
112 def test_push_dash_d(self):
113- self.thisFailsStrictLockCheck()
114 t = self.make_branch_and_tree('from')
115 t.commit(allow_pointless=True,
116 message='first commit')
117@@ -292,7 +287,6 @@
118
119 def test_push_create_prefix(self):
120 """'bzr push --create-prefix' will create leading directories."""
121- self.thisFailsStrictLockCheck()
122 tree = self.create_simple_tree()
123
124 self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
125@@ -309,7 +303,6 @@
126
127 By default, 'bzr push' will not use an existing, non-versioned dir.
128 """
129- self.thisFailsStrictLockCheck()
130 tree = self.create_simple_tree()
131 self.build_tree(['target/'])
132
133@@ -358,7 +351,6 @@
134
135 def test_push_with_revisionspec(self):
136 """We should be able to push a revision older than the tip."""
137- self.thisFailsStrictLockCheck()
138 tree_from = self.make_branch_and_tree('from')
139 tree_from.commit("One.", rev_id="from-1")
140 tree_from.commit("Two.", rev_id="from-2")
141@@ -400,7 +392,6 @@
142
143 def test_push_new_branch_stacked_on(self):
144 """Pushing a new branch with --stacked-on creates a stacked branch."""
145- self.thisFailsStrictLockCheck()
146 trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
147 # we publish branch_tree with a reference to the mainline.
148 out, err = self.run_bzr(['push', '--stacked-on', trunk_tree.branch.base,
149@@ -413,7 +404,6 @@
150
151 def test_push_new_branch_stacked_uses_parent_when_no_public_url(self):
152 """When the parent has no public url the parent is used as-is."""
153- self.thisFailsStrictLockCheck()
154 trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
155 # now we do a stacked push, which should determine the public location
156 # for us.
157@@ -427,7 +417,6 @@
158
159 def test_push_new_branch_stacked_uses_parent_public(self):
160 """Pushing a new branch with --stacked creates a stacked branch."""
161- self.thisFailsStrictLockCheck()
162 trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
163 # the trunk is published on a web server
164 self.transport_readonly_server = http_server.HttpServer
165@@ -512,7 +501,6 @@
166 out, err = self.run_bzr('push -d repo/local remote -r 3')
167
168 def test_push_verbose_shows_log(self):
169- self.thisFailsStrictLockCheck()
170 tree = self.make_branch_and_tree('source')
171 tree.commit('rev1')
172 out, err = self.run_bzr('push -v -d source target')
173@@ -526,7 +514,6 @@
174 self.assertNotContainsRe(out, 'rev1')
175
176 def test_push_from_subdir(self):
177- self.thisFailsStrictLockCheck()
178 t = self.make_branch_and_tree('tree')
179 self.build_tree(['tree/dir/', 'tree/dir/file'])
180 t.add('dir', 'dir/file')
181@@ -670,24 +657,19 @@
182 self.make_local_branch_and_tree()
183
184 def test_push_default(self):
185- self.thisFailsStrictLockCheck()
186 self.assertPushSucceeds([])
187
188 def test_push_strict(self):
189- self.thisFailsStrictLockCheck()
190 self.assertPushSucceeds(['--strict'])
191
192 def test_push_no_strict(self):
193- self.thisFailsStrictLockCheck()
194 self.assertPushSucceeds(['--no-strict'])
195
196 def test_push_config_var_strict(self):
197- self.thisFailsStrictLockCheck()
198 self.set_config_push_strict('true')
199 self.assertPushSucceeds([])
200
201 def test_push_config_var_no_strict(self):
202- self.thisFailsStrictLockCheck()
203 self.set_config_push_strict('false')
204 self.assertPushSucceeds([])
205
206@@ -734,11 +716,9 @@
207 self.assertPushFails([])
208
209 def test_push_with_revision(self):
210- self.thisFailsStrictLockCheck()
211 self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
212
213 def test_push_no_strict(self):
214- self.thisFailsStrictLockCheck()
215 self.assertPushSucceeds(['--no-strict'])
216
217 def test_push_strict_with_changes(self):
218@@ -753,13 +733,11 @@
219 self.assertPushFails([])
220
221 def test_push_no_strict_command_line_override_config(self):
222- self.thisFailsStrictLockCheck()
223 self.set_config_push_strict('yES')
224 self.assertPushFails([])
225 self.assertPushSucceeds(['--no-strict'])
226
227 def test_push_strict_command_line_override_config(self):
228- self.thisFailsStrictLockCheck()
229 self.set_config_push_strict('oFF')
230 self.assertPushFails(['--strict'])
231 self.assertPushSucceeds([])
232
233=== modified file 'bzrlib/tests/blackbox/test_tags.py'
234--- bzrlib/tests/blackbox/test_tags.py 2009-07-31 16:59:13 +0000
235+++ bzrlib/tests/blackbox/test_tags.py 2009-08-25 10:35:25 +0000
236@@ -74,7 +74,6 @@
237 out, err = self.run_bzr('tag -d branch NEWTAG --force')
238
239 def test_branch_push_pull_merge_copies_tags(self):
240- self.thisFailsStrictLockCheck()
241 t = self.make_branch_and_tree('branch1')
242 t.commit(allow_pointless=True, message='initial commit',
243 rev_id='first-revid')
244
245=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
246--- bzrlib/tests/blackbox/test_too_much.py 2009-07-31 16:59:13 +0000
247+++ bzrlib/tests/blackbox/test_too_much.py 2009-08-25 10:35:25 +0000
248@@ -280,7 +280,6 @@
249
250 def test_push(self):
251 # create a source branch
252- self.thisFailsStrictLockCheck()
253 os.mkdir('my-branch')
254 os.chdir('my-branch')
255 self.example_branch()
256@@ -613,7 +612,6 @@
257 self.run_bzr(['check', url])
258
259 def test_push(self):
260- self.thisFailsStrictLockCheck()
261 # create a source branch
262 os.mkdir('my-branch')
263 os.chdir('my-branch')
264
265=== modified file 'bzrlib/tests/per_branch/test_branch.py'
266--- bzrlib/tests/per_branch/test_branch.py 2009-07-31 16:59:13 +0000
267+++ bzrlib/tests/per_branch/test_branch.py 2009-08-25 10:35:25 +0000
268@@ -306,7 +306,6 @@
269 branch.repository.get_signature_text('A'))
270
271 def test_branch_keeps_signatures(self):
272- self.thisFailsStrictLockCheck()
273 wt = self.make_branch_and_tree('source')
274 wt.commit('A', allow_pointless=True, rev_id='A')
275 repo = wt.branch.repository
276
277=== modified file 'bzrlib/tests/per_branch/test_create_clone.py'
278--- bzrlib/tests/per_branch/test_create_clone.py 2009-07-31 16:59:13 +0000
279+++ bzrlib/tests/per_branch/test_create_clone.py 2009-08-25 10:35:25 +0000
280@@ -26,7 +26,6 @@
281 class TestCreateClone(TestCaseWithBranch):
282
283 def test_create_clone_on_transport_missing_parent_dir(self):
284- self.thisFailsStrictLockCheck()
285 tree = self.make_branch_and_tree('source')
286 tree.commit('a commit')
287 source = tree.branch
288@@ -36,7 +35,6 @@
289 self.assertFalse(self.get_transport('.').has('subdir'))
290
291 def test_create_clone_on_transport_missing_parent_dir_create(self):
292- self.thisFailsStrictLockCheck()
293 tree = self.make_branch_and_tree('source')
294 tree.commit('a commit')
295 source = tree.branch
296@@ -48,7 +46,6 @@
297 result.bzrdir.root_transport.base)
298
299 def test_create_clone_on_transport_use_existing_dir_false(self):
300- self.thisFailsStrictLockCheck()
301 tree = self.make_branch_and_tree('source')
302 tree.commit('a commit')
303 source = tree.branch
304@@ -59,7 +56,6 @@
305 self.assertFalse(target_transport.has(".bzr"))
306
307 def test_create_clone_on_transport_use_existing_dir_true(self):
308- self.thisFailsStrictLockCheck()
309 tree = self.make_branch_and_tree('source')
310 tree.commit('a commit')
311 source = tree.branch
312@@ -70,7 +66,6 @@
313 self.assertEqual(source.last_revision(), result.last_revision())
314
315 def test_create_clone_on_transport_no_revision_id(self):
316- self.thisFailsStrictLockCheck()
317 tree = self.make_branch_and_tree('source')
318 tree.commit('a commit')
319 source = tree.branch
320@@ -79,7 +74,6 @@
321 self.assertEqual(source.last_revision(), result.last_revision())
322
323 def test_create_clone_on_transport_revision_id(self):
324- self.thisFailsStrictLockCheck()
325 tree = self.make_branch_and_tree('source')
326 old_revid = tree.commit('a commit')
327 source_tip = tree.commit('a second commit')
328@@ -93,7 +87,6 @@
329 self.assertFalse(result.repository.has_revision(source_tip))
330
331 def test_create_clone_on_transport_stacked(self):
332- self.thisFailsStrictLockCheck()
333 tree = self.make_branch_and_tree('source')
334 tree.commit('a commit')
335 trunk = tree.branch.create_clone_on_transport(
336@@ -107,7 +100,6 @@
337 self.assertEqual(trunk.base, result.get_stacked_on_url())
338
339 def test_create_clone_of_multiple_roots(self):
340- self.thisFailsStrictLockCheck()
341 try:
342 builder = self.make_branch_builder('local')
343 except (errors.TransportNotPossible, errors.UninitializableFormat):
344@@ -129,7 +121,6 @@
345 self.hook_calls.append(pre_change_params)
346
347 def test_create_clone_on_transport_stacked_hooks_get_stacked_branch(self):
348- self.thisFailsStrictLockCheck()
349 tree = self.make_branch_and_tree('source')
350 tree.commit('a commit')
351 trunk = tree.branch.create_clone_on_transport(
352
353=== modified file 'bzrlib/tests/per_branch/test_stacking.py'
354--- bzrlib/tests/per_branch/test_stacking.py 2009-08-17 06:17:21 +0000
355+++ bzrlib/tests/per_branch/test_stacking.py 2009-08-25 10:35:25 +0000
356@@ -226,7 +226,6 @@
357 return stacked_bzrdir
358
359 def test_clone_from_stacked_branch_preserve_stacking(self):
360- self.thisFailsStrictLockCheck()
361 # We can clone from the bzrdir of a stacked branch. If
362 # preserve_stacking is True, the cloned branch is stacked on the
363 # same branch as the original.
364@@ -243,7 +242,6 @@
365 pass
366
367 def test_clone_from_branch_stacked_on_relative_url_preserve_stacking(self):
368- self.thisFailsStrictLockCheck()
369 # If a branch's stacked-on url is relative, we can still clone
370 # from it with preserve_stacking True and get a branch stacked
371 # on an appropriately adjusted relative url.
372@@ -258,7 +256,6 @@
373 cloned_bzrdir.open_branch().get_stacked_on_url())
374
375 def test_clone_from_stacked_branch_no_preserve_stacking(self):
376- self.thisFailsStrictLockCheck()
377 try:
378 stacked_bzrdir = self.make_stacked_bzrdir()
379 except unstackable_format_errors, e:
380@@ -272,7 +269,6 @@
381
382 def test_no_op_preserve_stacking(self):
383 """With no stacking, preserve_stacking should be a no-op."""
384- self.thisFailsStrictLockCheck()
385 branch = self.make_branch('source')
386 cloned_bzrdir = branch.bzrdir.clone('cloned', preserve_stacking=True)
387 self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
388@@ -309,7 +305,6 @@
389 """Obey policy where possible, ignore otherwise."""
390 if isinstance(self.branch_format, branch.BzrBranchFormat4):
391 raise TestNotApplicable('Branch format 4 does not autoupgrade.')
392- self.thisFailsStrictLockCheck()
393 source = self.make_branch('source')
394 stack_on = self.make_stacked_on_matching(source)
395 parent_bzrdir = self.make_bzrdir('.', format='default')
396@@ -467,7 +462,6 @@
397 self.assertEqual(['../stack-on'], hook_calls)
398
399 def test_stack_on_repository_branch(self):
400- self.thisFailsStrictLockCheck()
401 # Stacking should work when the repo isn't co-located with the
402 # stack-on branch.
403 try:
404
405=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
406--- bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-17 07:46:03 +0000
407+++ bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-25 10:35:25 +0000
408@@ -528,7 +528,6 @@
409 self.assertEqual('1', target.open_branch().last_revision())
410
411 def test_clone_bzrdir_tree_branch_repo(self):
412- self.thisFailsStrictLockCheck()
413 tree = self.make_branch_and_tree('source')
414 self.build_tree(['source/foo'])
415 tree.add('foo')
416@@ -569,7 +568,6 @@
417 self.assertEqual(target_repo._format, source_branch.repository._format)
418
419 def test_revert_inventory(self):
420- self.thisFailsStrictLockCheck()
421 tree = self.make_branch_and_tree('source')
422 self.build_tree(['source/foo'])
423 tree.add('foo')
424@@ -624,7 +622,6 @@
425 ])
426
427 def test_clone_bzrdir_tree_revision(self):
428- self.thisFailsStrictLockCheck()
429 # test for revision limiting, [smoke test, not corner case checks].
430 # make a tree with a revision with a last-revision
431 # and clone it with a revision limit.
432
433=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
434--- bzrlib/tests/per_interbranch/test_push.py 2009-08-14 13:55:30 +0000
435+++ bzrlib/tests/per_interbranch/test_push.py 2009-08-25 10:35:25 +0000
436@@ -361,7 +361,6 @@
437 self.hook_calls)
438
439 def test_post_push_nonempty_history(self):
440- self.thisFailsStrictLockCheck()
441 target = self.make_to_branch_and_tree('target')
442 target.lock_write()
443 target.add('')
444
445=== modified file 'bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py'
446--- bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py 2009-07-31 17:42:29 +0000
447+++ bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py 2009-08-25 10:35:25 +0000
448@@ -24,7 +24,6 @@
449 class TestGetRevIdForRevno(TestCaseWithExternalReferenceRepository):
450
451 def test_uses_fallback(self):
452- self.thisFailsStrictLockCheck()
453 tree = self.make_branch_and_tree('base')
454 base = tree.branch.repository
455 revid = tree.commit('one')
456
457=== modified file 'bzrlib/tests/per_workingtree/test_executable.py'
458--- bzrlib/tests/per_workingtree/test_executable.py 2009-07-31 17:42:29 +0000
459+++ bzrlib/tests/per_workingtree/test_executable.py 2009-08-25 10:35:25 +0000
460@@ -30,8 +30,6 @@
461
462 def setUp(self):
463 super(TestExecutable, self).setUp()
464- self.thisFailsStrictLockCheck()
465-
466 self.a_id = "a-20051208024829-849e76f7968d7a86"
467 self.b_id = "b-20051208024829-849e76f7968d7a86"
468 wt = self.make_branch_and_tree('b1')
469
470=== modified file 'bzrlib/tests/per_workingtree/test_set_root_id.py'
471--- bzrlib/tests/per_workingtree/test_set_root_id.py 2009-07-31 17:42:29 +0000
472+++ bzrlib/tests/per_workingtree/test_set_root_id.py 2009-08-25 10:35:25 +0000
473@@ -23,8 +23,8 @@
474 class TestSetRootId(TestCaseWithWorkingTree):
475
476 def test_set_and_read_unicode(self):
477- # This write locks the local tree, and then grabs a read lock on a
478- # copy, which is bogus and the test just needs to be rewritten.
479+ # This test tests that setting the root doesn't flush, so it
480+ # deliberately tests concurrent access that isn't possible on windows.
481 self.thisFailsStrictLockCheck()
482 tree = self.make_branch_and_tree('a-tree')
483 # setting the root id allows it to be read via get_root_id.
484
485=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
486--- bzrlib/tests/per_workingtree/test_workingtree.py 2009-07-31 17:42:29 +0000
487+++ bzrlib/tests/per_workingtree/test_workingtree.py 2009-08-25 10:35:25 +0000
488@@ -362,7 +362,6 @@
489 wt.get_parent_ids())
490
491 def test_clone_preserves_content(self):
492- self.thisFailsStrictLockCheck()
493 wt = self.make_branch_and_tree('source')
494 self.build_tree(['added', 'deleted', 'notadded'],
495 transport=wt.bzrdir.transport.clone('..'))
496
497=== modified file 'bzrlib/tests/test_errors.py'
498--- bzrlib/tests/test_errors.py 2009-07-07 03:40:29 +0000
499+++ bzrlib/tests/test_errors.py 2009-08-25 10:35:25 +0000
500@@ -1,6 +1,4 @@
501-# Copyright (C) 2006, 2007, 2008 Canonical Ltd
502-# Authors: Robert Collins <robert.collins@canonical.com>
503-# and others
504+# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
505 #
506 # This program is free software; you can redistribute it and/or modify
507 # it under the terms of the GNU General Public License as published by
508@@ -18,7 +16,9 @@
509
510 """Tests for the formatting and construction of errors."""
511
512+import socket
513 import sys
514+
515 from bzrlib import (
516 bzrdir,
517 errors,
518@@ -669,3 +669,10 @@
519 e = ErrorWithBadFormat(not_thing='x')
520 self.assertStartsWith(
521 str(e), 'Unprintable exception ErrorWithBadFormat')
522+
523+ def test_cannot_bind_address(self):
524+ # see <https://bugs.edge.launchpad.net/bzr/+bug/286871>
525+ e = errors.CannotBindAddress('example.com', 22,
526+ socket.error(13, 'Permission denied'))
527+ self.assertContainsRe(str(e),
528+ r'Cannot bind address "example\.com:22":.*Permission denied')
529
530=== modified file 'bzrlib/tests/test_merge.py'
531--- bzrlib/tests/test_merge.py 2009-07-31 17:42:29 +0000
532+++ bzrlib/tests/test_merge.py 2009-08-25 10:35:25 +0000
533@@ -117,7 +117,6 @@
534
535 def test_create_rename(self):
536 """Rename an inventory entry while creating the file"""
537- self.thisFailsStrictLockCheck()
538 tree =self.make_branch_and_tree('.')
539 file('name1', 'wb').write('Hello')
540 tree.add('name1')
541@@ -128,7 +127,6 @@
542
543 def test_layered_rename(self):
544 """Rename both child and parent at same time"""
545- self.thisFailsStrictLockCheck()
546 tree =self.make_branch_and_tree('.')
547 os.mkdir('dirname1')
548 tree.add('dirname1')
549
550=== modified file 'bzrlib/tests/test_merge_core.py'
551--- bzrlib/tests/test_merge_core.py 2009-07-31 17:42:29 +0000
552+++ bzrlib/tests/test_merge_core.py 2009-08-25 10:35:25 +0000
553@@ -438,7 +438,6 @@
554
555 def test_trivial_star_merge(self):
556 """Test that merges in a star shape Just Work."""
557- self.thisFailsStrictLockCheck() # clone?
558 # John starts a branch
559 self.build_tree(("original/", "original/file1", "original/file2"))
560 tree = self.make_branch_and_tree('original')
561@@ -468,7 +467,6 @@
562 self.assertEqual("Mary\n", open("original/file2", "rt").read())
563
564 def test_conflicts(self):
565- self.thisFailsStrictLockCheck() # clone?
566 os.mkdir('a')
567 wta = self.make_branch_and_tree('a')
568 a = wta.branch
569
570=== modified file 'bzrlib/tests/test_msgeditor.py'
571--- bzrlib/tests/test_msgeditor.py 2009-07-31 17:42:29 +0000
572+++ bzrlib/tests/test_msgeditor.py 2009-08-25 10:35:25 +0000
573@@ -81,7 +81,6 @@
574
575 def make_multiple_pending_tree(self):
576 from bzrlib import config
577- self.thisFailsStrictLockCheck() # clone?
578 config.GlobalConfig().set_user_option('email',
579 'Bilbo Baggins <bb@hobbit.net>')
580 tree = self.make_branch_and_tree('a')
581
582=== modified file 'bzrlib/tests/test_status.py'
583--- bzrlib/tests/test_status.py 2009-07-31 17:42:29 +0000
584+++ bzrlib/tests/test_status.py 2009-08-25 10:35:25 +0000
585@@ -43,7 +43,6 @@
586 self.assertContainsRe(output.getvalue(), 'empty commit')
587
588 def make_multiple_pending_tree(self):
589- self.thisFailsStrictLockCheck() # clone?
590 config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
591 tree = self.make_branch_and_tree('a')
592 tree.commit('commit 1', timestamp=1196796819, timezone=0)
593@@ -100,7 +99,6 @@
594
595 def test_pending_with_ghosts(self):
596 """Test when a pending merge's ancestry includes ghosts."""
597- self.thisFailsStrictLockCheck() # clone?
598 config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
599 tree = self.make_branch_and_tree('a')
600 tree.commit('empty commit')

Subscribers

People subscribed via source and target branches