bzr selftest errors
Marius Kruger
amanic at gmail.com
Wed May 28 12:15:43 BST 2008
hi,
If I run the selftests on the latest bzr.dev, I get 11 errors.
Is it just me or is there something wrong (its been happening for a while).
Can it be that I have missing dependencies?
(I still run Gutsy.)
I do the following:
/stuph/projects/bzr/bzr.repo/bzr.dev>$ bzr st
/stuph/projects/bzr/bzr.repo/bzr.dev>$ ./bzr --no-plugins selftest
testing: /stuph/projects/bzr/bzr.repo/bzr.dev/bzr
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib (1.6dev python2.5.1)
......
Ran 11157 tests in 608.094s
FAILED (errors=11, known_failure_count=15)
regards
marius
full log:
---------------
$ ./bzr --no-plugins selftest
testing: /stuph/projects/bzr/bzr.repo/bzr.dev/bzr
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib (1.6dev python2.5.1)
XFAIL: blackbox.test_info.TestInfo.test_info_locking
OS locks are exclusive for different processes (Bug #174055)
ERROR: blackbox.test_merge.TestMerge.test_weave_cherrypick
sequence item 0: expected string, tuple found
[1025/11157 in 2m9s, 1 err, 2 missing]
branch_implementations.test_break_lock.TestBreakLock.test_unlocks_master_branch(BzrBranchFormat5)
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmpC1RMiU/work/branch/.bzr/>) was gc'd
while locked
warn("%r was gc'd while locked" % self)
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lock.py:79: UserWarning: lock on
<open file
u'/tmp/testbzr-YqEsdg.tmp/tmpC1RMiU/work/branch/.bzr/branch-lock', mode
'rb+' at 0xa60f800> not released
warn("lock on %r not released" % self.f)
XFAIL:
repository_implementations.test_repository.TestRepository.test_sprout_branch_from_hpss_preserves_repo_format(RepositoryFormat7)
Cannot fetch weaves over smart protocol.
XFAIL:
repository_implementations.test_repository.TestRepository.test_sprout_branch_from_hpss_preserves_repo_format(RepositoryFormat5)
Cannot fetch weaves over smart protocol.
XFAIL:
repository_implementations.test_repository.TestRepository.test_sprout_branch_from_hpss_preserves_repo_format(RepositoryFormat6)
Cannot fetch weaves over smart protocol.
XFAIL:
repository_implementations.test_repository.TestRepository.test_sprout_from_hpss_preserves_format(RepositoryFormat7)
Cannot fetch weaves over smart protocol.
ERROR: test_annotate.TestAnnotate.test_annotate_duplicate_lines
sequence item 0: expected string, tuple found
ERROR: test_annotate.TestAnnotate.test_annotate_limits_dotted_revnos
sequence item 0: expected string, tuple found
ERROR: test_annotate.TestAnnotate.test_annotate_show_ids
sequence item 0: expected string, tuple found
ERROR: test_annotate.TestAnnotate.test_annotate_shows_dotted_revnos
sequence item 0: expected string, tuple found
ERROR: test_annotate.TestReannotate.test_reannotate
sequence item 0: expected string, tuple found
ERROR: test_diff.TestPatienceDiffLib_c.test_matching_blocks_tuples
sequence item 0: expected string, tuple found
XFAIL: test_knit.LowLevelKnitIndexTests_c.test_corrupted_parent
Pyrex <0.9.5 fails with TypeError when raising new style exceptions with
python >=2.5
XFAIL: test_knit.LowLevelKnitIndexTests_c.test_corrupted_parent_in_list
Pyrex <0.9.5 fails with TypeError when raising new style exceptions with
python >=2.5
XFAIL: test_knit.LowLevelKnitIndexTests_c.test_impossible_parent
Pyrex <0.9.5 fails with TypeError when raising new style exceptions with
python >=2.5
XFAIL: test_knit.LowLevelKnitIndexTests_c.test_invalid_position
Pyrex <0.9.5 fails with TypeError when raising new style exceptions with
python >=2.5
XFAIL: test_knit.LowLevelKnitIndexTests_c.test_invalid_size
Pyrex <0.9.5 fails with TypeError when raising new style exceptions with
python >=2.5
ERROR: test_merge.TestMerge.test_weave_cherrypick
sequence item 0: expected string, tuple found
ERROR: test_merge.TestPlanMerge.test_plan_lca_merge_with_base
sequence item 0: expected string, tuple found
ERROR: test_merge.TestPlanMerge.test_plan_merge_with_base
sequence item 0: expected string, tuple found
ERROR: test_merge.TestPlanMerge.test_subtract_plans
sequence item 0: expected string, tuple found
XFAIL: test_remote.TestBranchControlGetBranchConf.test_get_branch_conf
branch.conf is not retrieved by get_config_file
[7458/11157 in 7m28s, 11 err, 3 missing]
test_repository.TestDevelopment0.test_broken_physical_locks_error_on__unlock_names_lock
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmpemuI-x/work/.bzr/repository/>) was
gc'd while locked
warn("%r was gc'd while locked" % self)
[7475/11157 in 7m29s, 11 err, 3 missing]
test_repository.TestDevelopment0Subtree.test_broken_physical_locks_error_on__unlock_names_lock
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmppifB0k/work/.bzr/repository/>) was
gc'd while locked
warn("%r was gc'd while locked" % self)
[7517/11157 in 7m30s, 11 err, 3 missing]
test_repository.TestKnitPackNoSubtrees.test_commit_across_pack_shape_boundary_autopacks
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmpRt-xeG/work/.bzr/repository/>) was
gc'd while locked
warn("%r was gc'd while locked" % self)
[7532/11157 in 7m31s, 11 err, 3 missing]
test_repository.TestKnitPackSubtrees.test_break_lock_breaks_physical_lock
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmpw1NAuD/work/.bzr/repository/>) was
gc'd while locked
warn("%r was gc'd while locked" % self)
XFAIL: test_strace.TestStrace.test_strace_callable_is_called
26 active threads, bug #103133 needs to be fixed.
XFAIL: test_strace.TestStrace.test_strace_callable_result
26 active threads, bug #103133 needs to be fixed.
XFAIL: test_strace.TestStrace.test_strace_result_has_raw_log
26 active threads, bug #103133 needs to be fixed.
XFAIL: test_tag.TestTagsInCheckouts.test_tag_deletion_from_master_to_bound
tag deletion does not propagate: https://bugs.launchpad.net/bzr/+bug/138802
[8368/11157 in 8m25s, 11 err, 3 missing]
test_transform.TestTreeTransform.test_hardlink
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmp7oHqEE/work/.bzr/repository/>) was
gc'd while locked
warn("%r was gc'd while locked" % self)
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmp7oHqEE/work/.bzr/branch/>) was gc'd
while locked
warn("%r was gc'd while locked" % self)
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lockable_files.py:111:
UserWarning: LockableFiles(<bzrlib.transport.local.LocalTransport
url=file:///tmp/testbzr-YqEsdg.tmp/tmp7oHqEE/work/.bzr/checkout/>) was gc'd
while locked
warn("%r was gc'd while locked" % self)
/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/lock.py:79: UserWarning: lock on
<open file u'/tmp/testbzr-YqEsdg.tmp/tmp7oHqEE/work/.bzr/checkout/dirstate',
mode 'rb+' at 0xac596e0> not released
warn("lock on %r not released" % self.f)
[11157/11157 in 10m8s, 11 err, 4 missing]
bzrlib.version_info_formats.format_custom.Template
======================================================================
ERROR: test_weave_cherrypick (bzrlib.tests.blackbox.test_merge.TestMerge)
vvvv[log from
bzrlib.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick]
38.633 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/.
38.635 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x9f5be2c>
in file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/
38.641 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/checkout/dirstate'
38.642 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this'
38.654 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/
38.657 Selecting files for commit with filter None
INFO added file
38.661 added revision_id
{amanica at amanica-laptop-20080528065408-bqnx1ixepsuqfm9i}
INFO Committed revision 1.
38.669 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this'
38.675 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/.
38.678 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
38.685 creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x84c3e8c>
in file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/
38.697 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/checkout/dirstate'
38.697 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other'
38.711 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other'
38.715 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/
38.718 Selecting files for commit with filter None
INFO modified file
38.724 added revision_id
{amanica at amanica-laptop-20080528065408-0jh0zk02wxad3ssm}
INFO Committed revision 2.
38.732 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/
38.739 Selecting files for commit with filter None
INFO modified file
38.747 added revision_id
{amanica at amanica-laptop-20080528065409-vmv60aqvabqg0d1b}
INFO Committed revision 3.
38.752 run bzr: ['merge', '--weave', '-d', 'this', 'other', '-r', '-2..-1']
38.752 bzr arguments: ['merge', '--weave', '-d', 'this', 'other', '-r',
'-2..-1']
38.757 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this'
38.770 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
38.782 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpjH9O0s/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
38.802 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.blackbox.test_merge.TestMerge.test_weave_cherrypick]
----------------------------------------------------------------------
Traceback (most recent call last):
File
"/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/blackbox/test_merge.py",
line 450, in test_weave_cherrypick
self.run_bzr('merge --weave -d this other -r -2..-1')
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/__init__.py", line
1461, in run_bzr
working_dir=working_dir,
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/__init__.py", line
1375, in _run_bzr_autosplit
encoding=encoding, stdin=stdin, working_dir=working_dir,
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/__init__.py", line
1405, in _run_bzr_core
args)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/__init__.py", line
1691, in apply_redirected
return a_callable(*args, **kwargs)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 865,
in run_bzr_catch_user_errors
return run_bzr(argv)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 797,
in run_bzr
ret = run(*run_argv)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 499,
in run_argv_aliases
return self.run(**all_cmd_args)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/builtins.py", line 2927,
in run
verified)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/builtins.py", line 2945,
in _do_merge
conflict_count = merger.do_merge()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 420, in
do_merge
merge.do_merge()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 520, in
do_merge
self._compute_transform()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 558, in
_compute_transform
file_status = self.merge_contents(file_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 842, in
merge_contents
self.text_merge(file_id, trans_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1076, in
text_merge
lines, conflicts = self._merged_lines(file_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1069, in
_merged_lines
return textmerge.merge_lines(self.reprocess)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/textmerge.py", line 86,
in merge_lines
for group in self.merge_struct(reprocess):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/textmerge.py", line 72,
in iter_useful
for group in struct_iter:
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/versionedfile.py", line
669, in _merge_struct
for state, line in self.plan:
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1354, in
_subtract_plans
new_plan)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_annotate_duplicate_lines
(bzrlib.tests.test_annotate.TestAnnotate)
vvvv[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_duplicate_lines]
344.633 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/.
344.636 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x8f0782c> in file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/
344.642 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/checkout/dirstate'
344.642 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1'
344.652 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/
344.654 Selecting files for commit with filter None
INFO added file
344.658 added revision_id {rev-base}
INFO Committed revision 1.
344.666 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1'
344.678 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/.
344.681 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
344.690 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/
344.699 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1'
344.704 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/checkout/dirstate'
344.704 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2'
344.725 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2'
344.729 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/
344.733 Selecting files for commit with filter None
INFO modified file
344.739 added revision_id {rev-A}
INFO Committed revision 2.
344.751 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/
344.758 Selecting files for commit with filter None
INFO modified file
344.764 added revision_id {rev-B}
INFO Committed revision 2.
344.773 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
WARNING Text conflict in file
INFO 1 conflicts encountered.
344.801 preparing to commit
344.803 commit parent revision {rev-A}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/
344.807 Selecting files for commit with filter None
INFO modified file
344.813 added revision_id {rev-D}
INFO Committed revision 3.
344.822 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/
344.825 Selecting files for commit with filter None
INFO modified file
344.832 added revision_id {rev-C}
INFO Committed revision 3.
344.845 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
WARNING Text conflict in file
INFO 1 conflicts encountered.
344.878 preparing to commit
344.881 commit parent revision {rev-D}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpYiYmwd/work/tree1/
344.884 Selecting files for commit with filter None
INFO modified file
344.892 added revision_id {rev-E}
INFO Committed revision 4.
344.921 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_duplicate_lines]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 318, in test_annotate_duplicate_lines
self.assertRepoAnnotate(duplicate_D, repo, 'file-id', 'rev-D')
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 301, in assertRepoAnnotate
actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/revisiontree.py", line
92, in annotate_iter
return w.annotate(self.inventory[file_id].revision)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 1541, in
annotate
return self.factory.annotate(self, version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 629, in
annotate
return annotator.annotate(version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3339, in
annotate
self._annotate_records(records)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3318, in
_annotate_records
left_matching_blocks=blocks))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3157, in
_add_annotation
heads_provider=self._get_heads_provider()))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 186,
in reannotate
heads_provider)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 324,
in _reannotate_annotated
annotated_lines)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 228,
in _get_matching_blocks
old, new)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_annotate_limits_dotted_revnos
(bzrlib.tests.test_annotate.TestAnnotate)
vvvv[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_limits_dotted_revnos]
344.930 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/.
344.932 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x8f0f5ac> in file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/
344.941 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/checkout/dirstate'
344.941 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1'
344.953 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
344.955 Selecting files for commit with filter None
INFO added a
344.958 added revision_id {rev-1}
INFO Committed revision 1.
344.967 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1'
344.974 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/.
344.978 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
344.985 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/
344.995 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1'
345.000 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/checkout/dirstate'
345.000 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2'
345.024 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2'
345.027 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
345.031 Selecting files for commit with filter None
INFO modified a
345.036 added revision_id {rev-2}
INFO Committed revision 2.
345.044 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/
345.047 Selecting files for commit with filter None
INFO modified a
345.053 added revision_id {rev-1_1_1}
INFO Committed revision 2.
345.062 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
WARNING Text conflict in a
INFO 1 conflicts encountered.
345.091 preparing to commit
345.093 commit parent revision {rev-1_1_1}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
345.099 Selecting files for commit with filter None
INFO modified a
345.106 added revision_id {rev-3}
INFO Committed revision 3.
345.116 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2'
345.123 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/.
345.126 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.137 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/
345.146 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2'
345.151 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/checkout/dirstate'
345.152 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3'
345.171 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3'
345.175 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/
345.178 Selecting files for commit with filter None
345.187 added revision_id {rev-1_1_2}
INFO Committed revision 3.
345.196 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
INFO All changes applied successfully.
345.217 preparing to commit
345.219 commit parent revision {rev-1_1_2}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
345.223 Selecting files for commit with filter None
345.230 added revision_id {rev-4}
INFO Committed revision 4.
345.239 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/
345.241 Selecting files for commit with filter None
INFO modified a
345.246 added revision_id {rev-1_2_1}
INFO Committed revision 3.
345.254 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3'
345.261 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/.bzr/.
345.267 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.279 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/.bzr/
345.288 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3'
345.293 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/.bzr/checkout/dirstate'
345.293 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4'
345.313 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4'
345.316 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/
345.318 Selecting files for commit with filter None
345.324 added revision_id {rev-1_2_2}
INFO Committed revision 4.
345.334 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
INFO All changes applied successfully.
345.368 preparing to commit
345.372 commit parent revision {rev-1_2_2}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
345.376 Selecting files for commit with filter None
INFO modified a
345.388 added revision_id {rev-5}
INFO Committed revision 5.
345.396 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/
345.398 Selecting files for commit with filter None
INFO modified a
345.404 added revision_id {rev-1_3_1}
INFO Committed revision 4.
345.413 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree4/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.424 Auto-packing repository
<bzrlib.repofmt.pack_repo.RepositoryPackCollection object at 0xa480ccc>,
which has 9 pack files, containing 10 revisions into 1 packs.
INFO All changes applied successfully.
345.467 preparing to commit
345.469 commit parent revision {rev-1_3_1}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpCuORFv/work/tree1/
345.472 Selecting files for commit with filter None
INFO modified a
345.478 added revision_id {rev-6}
INFO Committed revision 6.
345.502 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_limits_dotted_revnos]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 338, in test_annotate_limits_dotted_revnos
to_file=sio, verbose=False, full=False)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 74,
in annotate_file
annotation = list(_annotate_file(branch, rev_id, file_id))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 126,
in _annotate_file
annotations = _annotations(branch.repository, file_id, rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 116,
in _annotations
return w.annotate(rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 1541, in
annotate
return self.factory.annotate(self, version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 629, in
annotate
return annotator.annotate(version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3339, in
annotate
self._annotate_records(records)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3318, in
_annotate_records
left_matching_blocks=blocks))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3157, in
_add_annotation
heads_provider=self._get_heads_provider()))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 186,
in reannotate
heads_provider)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 324,
in _reannotate_annotated
annotated_lines)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 228,
in _get_matching_blocks
old, new)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_annotate_show_ids (bzrlib.tests.test_annotate.TestAnnotate)
vvvv[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_show_ids]-
345.506 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/.
345.508 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0xa75930c> in file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/
345.516 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/checkout/dirstate'
345.516 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1'
345.525 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
345.527 Selecting files for commit with filter None
INFO added a
345.530 added revision_id {rev-1}
INFO Committed revision 1.
345.542 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1'
345.550 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/.
345.556 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.563 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/
345.572 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1'
345.577 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/checkout/dirstate'
345.578 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2'
345.597 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2'
345.601 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
345.603 Selecting files for commit with filter None
INFO modified a
345.609 added revision_id {rev-2}
INFO Committed revision 2.
345.617 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/
345.619 Selecting files for commit with filter None
INFO modified a
345.625 added revision_id {rev-1_1_1}
INFO Committed revision 2.
345.639 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
WARNING Text conflict in a
INFO 1 conflicts encountered.
345.666 preparing to commit
345.668 commit parent revision {rev-1_1_1}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
345.671 Selecting files for commit with filter None
INFO modified a
345.677 added revision_id {rev-3}
INFO Committed revision 3.
345.688 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2'
345.696 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/.
345.699 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.709 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/
345.722 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2'
345.728 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/checkout/dirstate'
345.728 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3'
345.747 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3'
345.750 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/
345.754 Selecting files for commit with filter None
345.758 added revision_id {rev-1_1_2}
INFO Committed revision 3.
345.768 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
INFO All changes applied successfully.
345.789 preparing to commit
345.792 commit parent revision {rev-1_1_2}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
345.795 Selecting files for commit with filter None
345.806 added revision_id {rev-4}
INFO Committed revision 4.
345.814 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/
345.816 Selecting files for commit with filter None
INFO modified a
345.821 added revision_id {rev-1_2_1}
INFO Committed revision 3.
345.831 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3'
345.838 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/.bzr/.
345.841 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/.bzr/repository/')(<RepositoryFormatKnitPack1>)
345.852 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/.bzr/
345.862 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3'
345.867 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/.bzr/checkout/dirstate'
345.867 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4'
345.889 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4'
345.893 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/
345.895 Selecting files for commit with filter None
345.901 added revision_id {rev-1_2_2}
INFO Committed revision 4.
345.911 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree3/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
INFO All changes applied successfully.
345.940 preparing to commit
345.944 commit parent revision {rev-1_2_2}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
345.947 Selecting files for commit with filter None
INFO modified a
345.958 added revision_id {rev-5}
INFO Committed revision 5.
345.967 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/
345.969 Selecting files for commit with filter None
INFO modified a
345.979 added revision_id {rev-1_3_1}
INFO Committed revision 4.
345.989 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree4/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
346.000 Auto-packing repository
<bzrlib.repofmt.pack_repo.RepositoryPackCollection object at 0xa47b80c>,
which has 9 pack files, containing 10 revisions into 1 packs.
INFO All changes applied successfully.
346.042 preparing to commit
346.044 commit parent revision {rev-1_3_1}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0VN4NU/work/tree1/
346.047 Selecting files for commit with filter None
INFO modified a
346.052 added revision_id {rev-6}
INFO Committed revision 6.
346.079 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_show_ids]-
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 404, in test_annotate_show_ids
to_file=sio, show_ids=True, full=False)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 62,
in annotate_file
annotations = _annotations(branch.repository, file_id, rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 116,
in _annotations
return w.annotate(rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 1541, in
annotate
return self.factory.annotate(self, version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 629, in
annotate
return annotator.annotate(version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3339, in
annotate
self._annotate_records(records)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3318, in
_annotate_records
left_matching_blocks=blocks))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3157, in
_add_annotation
heads_provider=self._get_heads_provider()))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 186,
in reannotate
heads_provider)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 324,
in _reannotate_annotated
annotated_lines)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 228,
in _get_matching_blocks
old, new)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_annotate_shows_dotted_revnos
(bzrlib.tests.test_annotate.TestAnnotate)
vvvv[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_shows_dotted_revnos]
346.084 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/.bzr/.
346.086 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0xa0395ac> in file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/.bzr/
346.093 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/.bzr/checkout/dirstate'
346.094 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1'
346.103 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/
346.104 Selecting files for commit with filter None
INFO added a
346.108 added revision_id {rev-1}
INFO Committed revision 1.
346.117 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1'
346.124 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/.bzr/.
346.127 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
346.135 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/.bzr/
346.146 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1'
346.154 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/.bzr/checkout/dirstate'
346.155 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2'
346.173 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2'
346.177 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/
346.179 Selecting files for commit with filter None
INFO modified a
346.186 added revision_id {rev-2}
INFO Committed revision 2.
346.193 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/
346.196 Selecting files for commit with filter None
INFO modified a
346.201 added revision_id {rev-1_1_1}
INFO Committed revision 2.
346.210 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree2/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/.bzr/repository/')(<RepositoryFormatKnitPack1>)
WARNING Text conflict in a
INFO 1 conflicts encountered.
346.238 preparing to commit
346.242 commit parent revision {rev-1_1_1}
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmp0fpwC9/work/tree1/
346.246 Selecting files for commit with filter None
INFO modified a
346.253 added revision_id {rev-3}
INFO Committed revision 3.
346.271 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_annotate.TestAnnotate.test_annotate_shows_dotted_revnos]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 326, in test_annotate_shows_dotted_revnos
to_file=sio)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 74,
in annotate_file
annotation = list(_annotate_file(branch, rev_id, file_id))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 126,
in _annotate_file
annotations = _annotations(branch.repository, file_id, rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 116,
in _annotations
return w.annotate(rev_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 1541, in
annotate
return self.factory.annotate(self, version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 629, in
annotate
return annotator.annotate(version_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3339, in
annotate
self._annotate_records(records)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3318, in
_annotate_records
left_matching_blocks=blocks))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/knit.py", line 3157, in
_add_annotation
heads_provider=self._get_heads_provider()))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 186,
in reannotate
heads_provider)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 324,
in _reannotate_annotated
annotated_lines)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 228,
in _get_matching_blocks
old, new)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_reannotate (bzrlib.tests.test_annotate.TestReannotate)
vvvv[log from
bzrlib.tests.test_annotate.TestReannotate.test_reannotate]------
^^^^[log from
bzrlib.tests.test_annotate.TestReannotate.test_reannotate]------
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 506, in test_reannotate
'blahblah')
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_annotate.py",
line 497, in annotateEqual
revision_id, blocks))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 186,
in reannotate
heads_provider)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 324,
in _reannotate_annotated
annotated_lines)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/annotate.py", line 228,
in _get_matching_blocks
old, new)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_matching_blocks_tuples
(bzrlib.tests.test_diff.TestPatienceDiffLib_c)
vvvv[log from
bzrlib.tests.test_diff.TestPatienceDiffLib_c.test_matching_blocks_tuples]
^^^^[log from
bzrlib.tests.test_diff.TestPatienceDiffLib_c.test_matching_blocks_tuples]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_diff.py",
line 889, in test_matching_blocks_tuples
self.assertDiffBlocks([('a',), ('b',), ('c,')], [], [])
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_diff.py",
line 832, in assertDiffBlocks
matcher = self._PatienceSequenceMatcher(None, a, b)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_weave_cherrypick (bzrlib.tests.test_merge.TestMerge)
vvvv[log from
bzrlib.tests.test_merge.TestMerge.test_weave_cherrypick]--------
426.784 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/.
426.790 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0xaa460ec> in file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/
426.797 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/checkout/dirstate'
426.797 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this'
426.806 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/
426.809 Selecting files for commit with filter None
INFO added file
426.812 added revision_id
{amanica at amanica-laptop-20080528070037-hg5l35jz8r29rcwb}
INFO Committed revision 1.
426.825 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this'
426.832 creating repository in
file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/.
426.837 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
426.844 creating branch <bzrlib.branch.BzrBranchFormat6 object at
0x84c3e8c> in file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/
426.855 trying to create missing lock
'/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/checkout/dirstate'
426.856 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other'
426.870 opening working tree '/tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other'
426.874 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/
426.878 Selecting files for commit with filter None
INFO modified file
426.884 added revision_id {rev2b}
INFO Committed revision 2.
426.892 preparing to commit
INFO Committing to: /tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/
426.895 Selecting files for commit with filter None
INFO modified file
426.903 added revision_id {rev3b}
INFO Committed revision 3.
426.911 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
426.924 Using fetch logic to copy between
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/other/.bzr/repository/')(<RepositoryFormatKnitPack1>)
and
KnitPackRepository('file:///tmp/testbzr-YqEsdg.tmp/tmpoEqjIw/work/this/.bzr/repository/')(<RepositoryFormatKnitPack1>)
426.946 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_merge.TestMerge.test_weave_cherrypick]--------
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_merge.py",
line 343, in test_weave_cherrypick
merger.do_merge()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 420, in
do_merge
merge.do_merge()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 520, in
do_merge
self._compute_transform()
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 558, in
_compute_transform
file_status = self.merge_contents(file_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 842, in
merge_contents
self.text_merge(file_id, trans_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1076, in
text_merge
lines, conflicts = self._merged_lines(file_id)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1069, in
_merged_lines
return textmerge.merge_lines(self.reprocess)
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/textmerge.py", line 86,
in merge_lines
for group in self.merge_struct(reprocess):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/textmerge.py", line 72,
in iter_useful
for group in struct_iter:
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/versionedfile.py", line
669, in _merge_struct
for state, line in self.plan:
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1354, in
_subtract_plans
new_plan)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_plan_lca_merge_with_base (bzrlib.tests.test_merge.TestPlanMerge)
vvvv[log from
bzrlib.tests.test_merge.TestPlanMerge.test_plan_lca_merge_with_base]
427.139 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_merge.TestPlanMerge.test_plan_lca_merge_with_base]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_merge.py",
line 628, in test_plan_lca_merge_with_base
], list(plan))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1354, in
_subtract_plans
new_plan)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_plan_merge_with_base (bzrlib.tests.test_merge.TestPlanMerge)
vvvv[log from
bzrlib.tests.test_merge.TestPlanMerge.test_plan_merge_with_base]
427.177 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_merge.TestPlanMerge.test_plan_merge_with_base]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_merge.py",
line 592, in test_plan_merge_with_base
], list(plan))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1354, in
_subtract_plans
new_plan)
TypeError: sequence item 0: expected string, tuple found
======================================================================
ERROR: test_subtract_plans (bzrlib.tests.test_merge.TestPlanMerge)
vvvv[log from
bzrlib.tests.test_merge.TestPlanMerge.test_subtract_plans]------
427.183 opening working tree '/tmp/testbzr-YqEsdg.tmp'
^^^^[log from
bzrlib.tests.test_merge.TestPlanMerge.test_subtract_plans]------
----------------------------------------------------------------------
Traceback (most recent call last):
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/tests/test_merge.py",
line 576, in test_subtract_plans
list(_PlanMerge._subtract_plans(old_plan, new_plan)))
File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/merge.py", line 1354, in
_subtract_plans
new_plan)
TypeError: sequence item 0: expected string, tuple found
----------------------------------------------------------------------
Ran 11157 tests in 608.094s
FAILED (errors=11, known_failure_count=15)
684 tests skipped
Missing feature 'FTPServer' skipped 77 tests.
Missing feature 'Internally performed glob expansion' skipped 5 tests.
Missing feature '_winreg' skipped 2 tests.
Missing feature 'case-insensitive filesystem' skipped 2 tests.
tests failed
bzrlib.tests.blackbox.test_branch.TestRemoteBranch.test_branch_local_remote
is leaking threads among 946 leaking tests
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080528/2197f4a5/attachment-0001.htm
More information about the bazaar
mailing list