Rev 4538: First pass at marking tests that are known to fail. in lp:///~jameinel/bzr/1.18-lock-warnings
John Arbash Meinel
john at arbash-meinel.com
Fri Jul 31 17:59:15 BST 2009
At lp:///~jameinel/bzr/1.18-lock-warnings
------------------------------------------------------------
revno: 4538
revision-id: john at arbash-meinel.com-20090731165913-a6wvatwu9nf849ae
parent: john at arbash-meinel.com-20090731165148-fg37wo885ppjp4we
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-lock-warnings
timestamp: Fri 2009-07-31 11:59:13 -0500
message:
First pass at marking tests that are known to fail.
It makes it pretty obvious that branch.bzrir.clone() is the primary fault
for lots of tests, as all of the 'push' failures are due to this
root cause.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py 2009-05-01 14:29:06 +0000
+++ b/bzrlib/tests/blackbox/test_info.py 2009-07-31 16:59:13 +0000
@@ -1339,6 +1339,7 @@
def test_info_locking_oslocks(self):
if sys.platform == "win32":
raise TestSkipped("don't use oslocks on win32 in unix manner")
+ self.thisFailsStrictLockCheck()
tree = self.make_branch_and_tree('branch',
format=bzrdir.BzrDirFormat6())
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2009-07-22 10:55:35 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2009-07-31 16:59:13 +0000
@@ -134,6 +134,7 @@
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)
@@ -155,6 +156,7 @@
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)
@@ -192,6 +194,7 @@
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<>%&;"\'')
@@ -199,6 +202,7 @@
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')
@@ -287,6 +291,7 @@
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'],
@@ -303,6 +308,7 @@
By default, 'bzr push' will not use an existing, non-versioned dir.
"""
+ self.thisFailsStrictLockCheck()
tree = self.create_simple_tree()
self.build_tree(['target/'])
@@ -351,6 +357,7 @@
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")
@@ -392,6 +399,7 @@
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,
@@ -404,6 +412,7 @@
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.
@@ -417,6 +426,7 @@
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
@@ -501,6 +511,7 @@
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')
@@ -514,6 +525,7 @@
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')
@@ -657,19 +669,24 @@
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([])
@@ -716,9 +733,11 @@
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):
@@ -733,6 +752,7 @@
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'])
=== modified file 'bzrlib/tests/blackbox/test_tags.py'
--- a/bzrlib/tests/blackbox/test_tags.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_tags.py 2009-07-31 16:59:13 +0000
@@ -74,6 +74,7 @@
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-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_too_much.py 2009-07-31 16:59:13 +0000
@@ -280,6 +280,7 @@
def test_push(self):
# create a source branch
+ self.thisFailsStrictLockCheck()
os.mkdir('my-branch')
os.chdir('my-branch')
self.example_branch()
@@ -612,6 +613,7 @@
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-10 10:46:00 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py 2009-07-31 16:59:13 +0000
@@ -306,6 +306,7 @@
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-10 05:49:34 +0000
+++ b/bzrlib/tests/per_branch/test_create_clone.py 2009-07-31 16:59:13 +0000
@@ -26,6 +26,7 @@
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
@@ -35,6 +36,7 @@
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
@@ -46,6 +48,7 @@
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
@@ -56,6 +59,7 @@
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
@@ -66,6 +70,7 @@
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
@@ -74,6 +79,7 @@
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')
@@ -87,6 +93,7 @@
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(
@@ -100,6 +107,7 @@
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):
@@ -121,6 +129,7 @@
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-07-24 03:15:56 +0000
+++ b/bzrlib/tests/per_branch/test_stacking.py 2009-07-31 16:59:13 +0000
@@ -225,6 +225,7 @@
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.
@@ -241,6 +242,7 @@
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.
@@ -255,6 +257,7 @@
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:
@@ -268,6 +271,7 @@
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),
@@ -288,6 +292,7 @@
def test_clone_stacking_policy_handling(self):
"""Obey policy where possible, ignore otherwise."""
+ self.thisFailsStrictLockCheck()
stack_on = self.make_branch('stack-on')
parent_bzrdir = self.make_bzrdir('.', format='default')
parent_bzrdir.get_config().set_default_stack_on('stack-on')
@@ -438,6 +443,7 @@
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-07-17 10:38:41 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py 2009-07-31 16:59:13 +0000
@@ -528,6 +528,7 @@
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')
More information about the bazaar-commits
mailing list