Rev 4629: Mark tests that now work as working. in http://bazaar.launchpad.net/~lifeless/bzr/transform_tree
Robert Collins
robertc at robertcollins.net
Thu Aug 20 05:10:08 BST 2009
At http://bazaar.launchpad.net/~lifeless/bzr/transform_tree
------------------------------------------------------------
revno: 4629
revision-id: robertc at robertcollins.net-20090820040958-3b3cuuwooz03rnpm
parent: robertc at robertcollins.net-20090820030650-00gim570vd6nra16
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transform_tree
timestamp: Thu 2009-08-20 14:09:58 +1000
message:
Mark tests that now work as working.
=== modified file 'NEWS'
--- a/NEWS 2009-08-18 20:05:30 +0000
+++ b/NEWS 2009-08-20 04:09:58 +0000
@@ -22,8 +22,8 @@
--version`` and ``bzr selftest``.
(Martin Pool, #409137)
-bzr 1.18
-########
+* ``bzr push`` locally on windows will no longer give a locking error with
+ dirstate based formats. (Robert Collins)
Compatibility Breaks
********************
=== modified file 'bzrlib/tests/blackbox/test_non_ascii.py'
--- a/bzrlib/tests/blackbox/test_non_ascii.py 2009-07-31 17:53:02 +0000
+++ b/bzrlib/tests/blackbox/test_non_ascii.py 2009-08-20 04:09:58 +0000
@@ -287,7 +287,6 @@
# the files around as much.
# Note that the tests don't actually fail, but if we don't set this
# flag, we end up getting "Lock was not Unlocked" warnings
- self.thisFailsStrictLockCheck() # clone?
dirname = self.info['directory']
self.run_bzr_decode(['push', dirname])
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2009-07-31 17:53:02 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2009-08-20 04:09:58 +0000
@@ -134,7 +134,6 @@
def test_push_without_tree(self):
# bzr push from a branch that does not have a checkout should work.
- self.thisFailsStrictLockCheck()
b = self.make_branch('.')
out, err = self.run_bzr('push pushed-location')
self.assertEqual('', out)
@@ -146,7 +145,6 @@
# bzr push of a branch with revisions to a new location
# should print the number of revisions equal to the length of the
# local branch.
- self.thisFailsStrictLockCheck()
t = self.make_branch_and_tree('tree')
self.build_tree(['tree/file'])
t.add('file')
@@ -157,7 +155,6 @@
def test_push_only_pushes_history(self):
# Knit branches should only push the history for the current revision.
- self.thisFailsStrictLockCheck()
format = bzrdir.BzrDirMetaFormat1()
format.repository_format = knitrepo.RepositoryFormatKnit1()
shared_repo = self.make_repository('repo', format=format, shared=True)
@@ -195,7 +192,6 @@
self.assertTrue(pushed_repo.has_revision('b-1'))
def test_push_funky_id(self):
- self.thisFailsStrictLockCheck()
t = self.make_branch_and_tree('tree')
self.build_tree(['tree/filename'])
t.add('filename', 'funky-chars<>%&;"\'')
@@ -203,7 +199,6 @@
self.run_bzr('push -d tree new-tree')
def test_push_dash_d(self):
- self.thisFailsStrictLockCheck()
t = self.make_branch_and_tree('from')
t.commit(allow_pointless=True,
message='first commit')
@@ -292,7 +287,6 @@
def test_push_create_prefix(self):
"""'bzr push --create-prefix' will create leading directories."""
- self.thisFailsStrictLockCheck()
tree = self.create_simple_tree()
self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
@@ -309,7 +303,6 @@
By default, 'bzr push' will not use an existing, non-versioned dir.
"""
- self.thisFailsStrictLockCheck()
tree = self.create_simple_tree()
self.build_tree(['target/'])
@@ -358,7 +351,6 @@
def test_push_with_revisionspec(self):
"""We should be able to push a revision older than the tip."""
- self.thisFailsStrictLockCheck()
tree_from = self.make_branch_and_tree('from')
tree_from.commit("One.", rev_id="from-1")
tree_from.commit("Two.", rev_id="from-2")
@@ -400,7 +392,6 @@
def test_push_new_branch_stacked_on(self):
"""Pushing a new branch with --stacked-on creates a stacked branch."""
- self.thisFailsStrictLockCheck()
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
# we publish branch_tree with a reference to the mainline.
out, err = self.run_bzr(['push', '--stacked-on', trunk_tree.branch.base,
@@ -413,7 +404,6 @@
def test_push_new_branch_stacked_uses_parent_when_no_public_url(self):
"""When the parent has no public url the parent is used as-is."""
- self.thisFailsStrictLockCheck()
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
# now we do a stacked push, which should determine the public location
# for us.
@@ -427,7 +417,6 @@
def test_push_new_branch_stacked_uses_parent_public(self):
"""Pushing a new branch with --stacked creates a stacked branch."""
- self.thisFailsStrictLockCheck()
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
# the trunk is published on a web server
self.transport_readonly_server = http_server.HttpServer
@@ -512,7 +501,6 @@
out, err = self.run_bzr('push -d repo/local remote -r 3')
def test_push_verbose_shows_log(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('rev1')
out, err = self.run_bzr('push -v -d source target')
@@ -526,7 +514,6 @@
self.assertNotContainsRe(out, 'rev1')
def test_push_from_subdir(self):
- self.thisFailsStrictLockCheck()
t = self.make_branch_and_tree('tree')
self.build_tree(['tree/dir/', 'tree/dir/file'])
t.add('dir', 'dir/file')
@@ -670,24 +657,19 @@
self.make_local_branch_and_tree()
def test_push_default(self):
- self.thisFailsStrictLockCheck()
self.assertPushSucceeds([])
def test_push_strict(self):
- self.thisFailsStrictLockCheck()
self.assertPushSucceeds(['--strict'])
def test_push_no_strict(self):
- self.thisFailsStrictLockCheck()
self.assertPushSucceeds(['--no-strict'])
def test_push_config_var_strict(self):
- self.thisFailsStrictLockCheck()
self.set_config_push_strict('true')
self.assertPushSucceeds([])
def test_push_config_var_no_strict(self):
- self.thisFailsStrictLockCheck()
self.set_config_push_strict('false')
self.assertPushSucceeds([])
@@ -734,11 +716,9 @@
self.assertPushFails([])
def test_push_with_revision(self):
- self.thisFailsStrictLockCheck()
self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
def test_push_no_strict(self):
- self.thisFailsStrictLockCheck()
self.assertPushSucceeds(['--no-strict'])
def test_push_strict_with_changes(self):
@@ -753,13 +733,11 @@
self.assertPushFails([])
def test_push_no_strict_command_line_override_config(self):
- self.thisFailsStrictLockCheck()
self.set_config_push_strict('yES')
self.assertPushFails([])
self.assertPushSucceeds(['--no-strict'])
def test_push_strict_command_line_override_config(self):
- self.thisFailsStrictLockCheck()
self.set_config_push_strict('oFF')
self.assertPushFails(['--strict'])
self.assertPushSucceeds([])
=== modified file 'bzrlib/tests/blackbox/test_tags.py'
--- a/bzrlib/tests/blackbox/test_tags.py 2009-07-31 16:59:13 +0000
+++ b/bzrlib/tests/blackbox/test_tags.py 2009-08-20 04:09:58 +0000
@@ -74,7 +74,6 @@
out, err = self.run_bzr('tag -d branch NEWTAG --force')
def test_branch_push_pull_merge_copies_tags(self):
- self.thisFailsStrictLockCheck()
t = self.make_branch_and_tree('branch1')
t.commit(allow_pointless=True, message='initial commit',
rev_id='first-revid')
=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- a/bzrlib/tests/blackbox/test_too_much.py 2009-07-31 16:59:13 +0000
+++ b/bzrlib/tests/blackbox/test_too_much.py 2009-08-20 04:09:58 +0000
@@ -280,7 +280,6 @@
def test_push(self):
# create a source branch
- self.thisFailsStrictLockCheck()
os.mkdir('my-branch')
os.chdir('my-branch')
self.example_branch()
@@ -613,7 +612,6 @@
self.run_bzr(['check', url])
def test_push(self):
- self.thisFailsStrictLockCheck()
# create a source branch
os.mkdir('my-branch')
os.chdir('my-branch')
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py 2009-07-31 16:59:13 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py 2009-08-20 04:09:58 +0000
@@ -306,7 +306,6 @@
branch.repository.get_signature_text('A'))
def test_branch_keeps_signatures(self):
- self.thisFailsStrictLockCheck()
wt = self.make_branch_and_tree('source')
wt.commit('A', allow_pointless=True, rev_id='A')
repo = wt.branch.repository
=== modified file 'bzrlib/tests/per_branch/test_create_clone.py'
--- a/bzrlib/tests/per_branch/test_create_clone.py 2009-07-31 16:59:13 +0000
+++ b/bzrlib/tests/per_branch/test_create_clone.py 2009-08-20 04:09:58 +0000
@@ -26,7 +26,6 @@
class TestCreateClone(TestCaseWithBranch):
def test_create_clone_on_transport_missing_parent_dir(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
source = tree.branch
@@ -36,7 +35,6 @@
self.assertFalse(self.get_transport('.').has('subdir'))
def test_create_clone_on_transport_missing_parent_dir_create(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
source = tree.branch
@@ -48,7 +46,6 @@
result.bzrdir.root_transport.base)
def test_create_clone_on_transport_use_existing_dir_false(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
source = tree.branch
@@ -59,7 +56,6 @@
self.assertFalse(target_transport.has(".bzr"))
def test_create_clone_on_transport_use_existing_dir_true(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
source = tree.branch
@@ -70,7 +66,6 @@
self.assertEqual(source.last_revision(), result.last_revision())
def test_create_clone_on_transport_no_revision_id(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
source = tree.branch
@@ -79,7 +74,6 @@
self.assertEqual(source.last_revision(), result.last_revision())
def test_create_clone_on_transport_revision_id(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
old_revid = tree.commit('a commit')
source_tip = tree.commit('a second commit')
@@ -93,7 +87,6 @@
self.assertFalse(result.repository.has_revision(source_tip))
def test_create_clone_on_transport_stacked(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
trunk = tree.branch.create_clone_on_transport(
@@ -107,7 +100,6 @@
self.assertEqual(trunk.base, result.get_stacked_on_url())
def test_create_clone_of_multiple_roots(self):
- self.thisFailsStrictLockCheck()
try:
builder = self.make_branch_builder('local')
except (errors.TransportNotPossible, errors.UninitializableFormat):
@@ -129,7 +121,6 @@
self.hook_calls.append(pre_change_params)
def test_create_clone_on_transport_stacked_hooks_get_stacked_branch(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
tree.commit('a commit')
trunk = tree.branch.create_clone_on_transport(
=== modified file 'bzrlib/tests/per_branch/test_stacking.py'
--- a/bzrlib/tests/per_branch/test_stacking.py 2009-08-17 06:17:21 +0000
+++ b/bzrlib/tests/per_branch/test_stacking.py 2009-08-20 04:09:58 +0000
@@ -226,7 +226,6 @@
return stacked_bzrdir
def test_clone_from_stacked_branch_preserve_stacking(self):
- self.thisFailsStrictLockCheck()
# We can clone from the bzrdir of a stacked branch. If
# preserve_stacking is True, the cloned branch is stacked on the
# same branch as the original.
@@ -243,7 +242,6 @@
pass
def test_clone_from_branch_stacked_on_relative_url_preserve_stacking(self):
- self.thisFailsStrictLockCheck()
# If a branch's stacked-on url is relative, we can still clone
# from it with preserve_stacking True and get a branch stacked
# on an appropriately adjusted relative url.
@@ -258,7 +256,6 @@
cloned_bzrdir.open_branch().get_stacked_on_url())
def test_clone_from_stacked_branch_no_preserve_stacking(self):
- self.thisFailsStrictLockCheck()
try:
stacked_bzrdir = self.make_stacked_bzrdir()
except unstackable_format_errors, e:
@@ -272,7 +269,6 @@
def test_no_op_preserve_stacking(self):
"""With no stacking, preserve_stacking should be a no-op."""
- self.thisFailsStrictLockCheck()
branch = self.make_branch('source')
cloned_bzrdir = branch.bzrdir.clone('cloned', preserve_stacking=True)
self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
@@ -309,7 +305,6 @@
"""Obey policy where possible, ignore otherwise."""
if isinstance(self.branch_format, branch.BzrBranchFormat4):
raise TestNotApplicable('Branch format 4 does not autoupgrade.')
- self.thisFailsStrictLockCheck()
source = self.make_branch('source')
stack_on = self.make_stacked_on_matching(source)
parent_bzrdir = self.make_bzrdir('.', format='default')
@@ -467,7 +462,6 @@
self.assertEqual(['../stack-on'], hook_calls)
def test_stack_on_repository_branch(self):
- self.thisFailsStrictLockCheck()
# Stacking should work when the repo isn't co-located with the
# stack-on branch.
try:
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-17 07:46:03 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-08-20 04:09:58 +0000
@@ -528,7 +528,6 @@
self.assertEqual('1', target.open_branch().last_revision())
def test_clone_bzrdir_tree_branch_repo(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
tree.add('foo')
@@ -569,7 +568,6 @@
self.assertEqual(target_repo._format, source_branch.repository._format)
def test_revert_inventory(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
tree.add('foo')
@@ -624,7 +622,6 @@
])
def test_clone_bzrdir_tree_revision(self):
- self.thisFailsStrictLockCheck()
# test for revision limiting, [smoke test, not corner case checks].
# make a tree with a revision with a last-revision
# and clone it with a revision limit.
=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- a/bzrlib/tests/per_interbranch/test_push.py 2009-08-14 13:55:30 +0000
+++ b/bzrlib/tests/per_interbranch/test_push.py 2009-08-20 04:09:58 +0000
@@ -361,7 +361,6 @@
self.hook_calls)
def test_post_push_nonempty_history(self):
- self.thisFailsStrictLockCheck()
target = self.make_to_branch_and_tree('target')
target.lock_write()
target.add('')
=== modified file 'bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py'
--- a/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/per_repository_reference/test_get_rev_id_for_revno.py 2009-08-20 04:09:58 +0000
@@ -24,7 +24,6 @@
class TestGetRevIdForRevno(TestCaseWithExternalReferenceRepository):
def test_uses_fallback(self):
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('base')
base = tree.branch.repository
revid = tree.commit('one')
=== modified file 'bzrlib/tests/per_workingtree/test_executable.py'
--- a/bzrlib/tests/per_workingtree/test_executable.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/per_workingtree/test_executable.py 2009-08-20 04:09:58 +0000
@@ -30,8 +30,6 @@
def setUp(self):
super(TestExecutable, self).setUp()
- self.thisFailsStrictLockCheck()
-
self.a_id = "a-20051208024829-849e76f7968d7a86"
self.b_id = "b-20051208024829-849e76f7968d7a86"
wt = self.make_branch_and_tree('b1')
=== modified file 'bzrlib/tests/per_workingtree/test_set_root_id.py'
--- a/bzrlib/tests/per_workingtree/test_set_root_id.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/per_workingtree/test_set_root_id.py 2009-08-20 04:09:58 +0000
@@ -23,9 +23,6 @@
class TestSetRootId(TestCaseWithWorkingTree):
def test_set_and_read_unicode(self):
- # This write locks the local tree, and then grabs a read lock on a
- # copy, which is bogus and the test just needs to be rewritten.
- self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('a-tree')
# setting the root id allows it to be read via get_root_id.
root_id = u'\xe5n-id'.encode('utf8')
=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- a/bzrlib/tests/per_workingtree/test_workingtree.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/per_workingtree/test_workingtree.py 2009-08-20 04:09:58 +0000
@@ -362,7 +362,6 @@
wt.get_parent_ids())
def test_clone_preserves_content(self):
- self.thisFailsStrictLockCheck()
wt = self.make_branch_and_tree('source')
self.build_tree(['added', 'deleted', 'notadded'],
transport=wt.bzrdir.transport.clone('..'))
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/test_merge.py 2009-08-20 04:09:58 +0000
@@ -117,7 +117,6 @@
def test_create_rename(self):
"""Rename an inventory entry while creating the file"""
- self.thisFailsStrictLockCheck()
tree =self.make_branch_and_tree('.')
file('name1', 'wb').write('Hello')
tree.add('name1')
@@ -128,7 +127,6 @@
def test_layered_rename(self):
"""Rename both child and parent at same time"""
- self.thisFailsStrictLockCheck()
tree =self.make_branch_and_tree('.')
os.mkdir('dirname1')
tree.add('dirname1')
=== modified file 'bzrlib/tests/test_merge_core.py'
--- a/bzrlib/tests/test_merge_core.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/test_merge_core.py 2009-08-20 04:09:58 +0000
@@ -438,7 +438,6 @@
def test_trivial_star_merge(self):
"""Test that merges in a star shape Just Work."""
- self.thisFailsStrictLockCheck() # clone?
# John starts a branch
self.build_tree(("original/", "original/file1", "original/file2"))
tree = self.make_branch_and_tree('original')
@@ -468,7 +467,6 @@
self.assertEqual("Mary\n", open("original/file2", "rt").read())
def test_conflicts(self):
- self.thisFailsStrictLockCheck() # clone?
os.mkdir('a')
wta = self.make_branch_and_tree('a')
a = wta.branch
=== modified file 'bzrlib/tests/test_msgeditor.py'
--- a/bzrlib/tests/test_msgeditor.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/test_msgeditor.py 2009-08-20 04:09:58 +0000
@@ -81,7 +81,6 @@
def make_multiple_pending_tree(self):
from bzrlib import config
- self.thisFailsStrictLockCheck() # clone?
config.GlobalConfig().set_user_option('email',
'Bilbo Baggins <bb at hobbit.net>')
tree = self.make_branch_and_tree('a')
=== modified file 'bzrlib/tests/test_status.py'
--- a/bzrlib/tests/test_status.py 2009-07-31 17:42:29 +0000
+++ b/bzrlib/tests/test_status.py 2009-08-20 04:09:58 +0000
@@ -43,7 +43,6 @@
self.assertContainsRe(output.getvalue(), 'empty commit')
def make_multiple_pending_tree(self):
- self.thisFailsStrictLockCheck() # clone?
config.GlobalConfig().set_user_option('email', 'Joe Foo <joe at foo.com>')
tree = self.make_branch_and_tree('a')
tree.commit('commit 1', timestamp=1196796819, timezone=0)
@@ -100,7 +99,6 @@
def test_pending_with_ghosts(self):
"""Test when a pending merge's ancestry includes ghosts."""
- self.thisFailsStrictLockCheck() # clone?
config.GlobalConfig().set_user_option('email', 'Joe Foo <joe at foo.com>')
tree = self.make_branch_and_tree('a')
tree.commit('empty commit')
More information about the bazaar-commits
mailing list