[Pkg-bazaar-maint] Bug#680803: bzr-builddeb: FTBFS: test failed
Lucas Nussbaum
lucas at lucas-nussbaum.net
Sun Jul 8 16:47:50 UTC 2012
Source: bzr-builddeb
Version: 2.8.4
Severity: serious
Tags: wheezy sid
User: debian-qa at lists.debian.org
Usertags: qa-ftbfs-20120708 qa-ftbfs
Justification: FTBFS on amd64
Hi,
During a rebuild of all packages in sid, your package failed to build on
amd64.
Relevant part:
> debian/rules build
> python2.7 setup.py build
> running build
> running build_py
> creating build
> creating build/lib.linux-x86_64-2.7
> creating build/lib.linux-x86_64-2.7/bzrlib
> creating build/lib.linux-x86_64-2.7/bzrlib/plugins
> creating build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./cmds.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./merge_upstream.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./info.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./hooks.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./bzrtools_import.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./import_dsc.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./builder.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./merge_package.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./errors.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./launchpad.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./merge_changelog.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./dh_make.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./__init__.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./source_distiller.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./directory.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./util.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./version.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./dep3.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./repack_tarball.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./merge_quilt.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./config.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./revspec.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./tagging.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./quilt.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> copying ./bzrtools_bzrtools.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb
> creating build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_dep3.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_repack_tarball_extra.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_merge_upstream.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_merge_changelog.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_source_distiller.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_quilt.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_repack_tarball.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/__init__.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_import_dsc.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_merge_package.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_upstream.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_util.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_bzrtools_import.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_config.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_hooks.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_revspec.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_tagging.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_merge_quilt.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_dh_make.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_commit_message.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> copying ./tests/test_builder.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests
> creating build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_get_tar.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_dep3.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_import_upstream.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_merge_upstream.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_do.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/__init__.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_import_dsc.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_merge_package.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_mark_uploaded.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> copying ./tests/blackbox/test_builddeb.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/tests/blackbox
> creating build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/upstream
> copying ./upstream/__init__.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/upstream
> copying ./upstream/branch.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/upstream
> copying ./upstream/pristinetar.py -> build/lib.linux-x86_64-2.7/bzrlib/plugins/builddeb/upstream
> running build_scripts
> creating build/scripts-2.7
> copying bzr-buildpackage -> build/scripts-2.7
> changing mode of build/scripts-2.7/bzr-buildpackage from 644 to 755
> BZR_CONCURRENCY=10 BZR_PLUGINS_AT=builddeb@/«PKGBUILDDIR» python2.7 /usr/bin/bzr selftest \
> --parallel=fork -v -s bp.builddeb
> failed to open trace file: [Errno 2] No such file or directory: '/sbuild-nonexistent/.bzr.log'
> running 0 tests...
> bzr selftest: /usr/bin/bzr
> /usr/lib/python2.7/dist-packages/bzrlib
> bzr-2.6.0dev2 python-2.7.3 Linux-2.6.32-5-xen-amd64-x86_64-with-debian-wheezy-sid
>
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_bd_alias OK 143ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_error_on_two_revisions OK 262ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_registered OK 341ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_not_package OK 589ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_allows_building_revision_0 OK 711ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_strict OK 598ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog OK 655ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_hooks OK 986ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_bd_do_not_merge OK 182ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_package_merge_first OK 525ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builder OK 1028ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_nothing_to_do OK 729ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_uses_revision_when_told OK 1175ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_refuses_tree_with_conflicts OK 1322ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_bd_do_registered OK 5ms
> bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_builddeb_uses_working_tree OK 1220ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source OK 401ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_range OK 1230ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_directory OK 389ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_simple OK 1114ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_uses_single_revision_commit OK 868ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_copy_on_success OK 526ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_open_ended_range OK 848ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_export_purged OK 410ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_uses_config_description OK 935ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_upstream_branch OK 948ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_removed_files_are_removed_in_branch OK 365ms
> bzrlib.plugins.builddeb.tests.blackbox.test_dep3.TestDep3Patch.test_upstream_branch_disabled OK 879ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_apply_patches OK 1183ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_fails_no_changelog OK 141ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_contents_taken_from_export OK 437ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_no_copy_on_fail OK 397ms
> dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_error_no_changelog OK 105ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_error_no_tar OK 562ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_explicit_version OK 558ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_new_directories_created OK 484ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_registered OK 52ms
> bzrlib.plugins.builddeb.tests.blackbox.test_do.TestDo.test_uses_shell OK 537ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded OK 277ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded_changes OK 272ms
> bzrlib.plugins.builddeb.tests.blackbox.test_get_tar.TestGetOrigSource.test_get_orig_source_explicit_version_not_found OK 738ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded_available OK 23ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded_already OK 451ms
> dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
> dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
> bzrlib.plugins.builddeb.tests.blackbox.test_import_upstream.TestImportUpstream.test_import_upstream_with_branch_no_prior_tarball OK 2190ms
> dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
> bzrlib.plugins.builddeb.tests.blackbox.test_import_dsc.TestImportDsc.test_import_no_files OK 1737ms
> bzrlib.plugins.builddeb.tests.blackbox.test_import_upstream.TestImportUpstream.test_import_upstream_no_branch_no_prior_tarball OK 3542ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package FAIL 2696ms
> log: {{{
> 3.442 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/.
> 3.468 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x29b4310> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/
> 3.500 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/checkout/dirstate'
> 3.500 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1'
> 3.539 preparing to commit
> INFO Committing to: /tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/
> 3.561 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-2
> INFO Committed revision 1.
> 3.602 Committed revid jrandom at example.com-20120708071551-n2goabj6s2kmzhc1 as revno 1.
> 3.622 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1'
> 3.661 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/.
> 3.680 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 3.680 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-n2goabj6s2kmzhc1']) repo:CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/repository/')>
> 3.722 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x37d4610> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/
> 3.759 created new branch BzrBranch7(file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/)
> 3.779 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/checkout/dirstate'
> 3.780 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> 3.845 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> 3.865 export version <InventoryRevisionTree instance at 37d0310, rev_id='jrandom at example.com-20120708071551-n2goabj6s2kmzhc1'>
> 3.883 run bzr: ['merge-upstream', '--version', '4', '--package', 'bar', '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/project-4.tar.gz']
> 3.883 bazaar version: 2.6.0dev2
> 3.883 bzr arguments: [u'merge-upstream', u'--version', u'4', u'--package', u'bar', u'/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/project-4.tar.gz']
> 3.884 encoding stdout as sys.stdout encoding 'ascii'
> 3.904 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> INFO No distribution specified, and no changelog, assuming 'debian'
> INFO Using version string 4.
> 3.967 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/.
> 3.969 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x37e1950> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/
> 4.010 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/checkout/dirstate'
> 4.023 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream'
> 4.052 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream'
> 4.159 Importing upstream version 4 from /tmp/tmp6R06Ge with parents {None: []}
> 4.237 export version <WorkingTree6 of /tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream>
> 5.330 imported bar version 4 component None as revid jrandom at example.com-20120708071552-ifsahqjni58qt6ri, tagged upstream-4
> 5.351 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.351 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:']), 1)>
> 5.413 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.413 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.436 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.436 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.451 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.451 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.452 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.452 fetching: <SearchResult search:(set(['null:']), set(['null:']), 0)>
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 6.114 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 6.114 errors:
> 'No distribution specified, and no changelog, assuming \'debian\'\nUsing version string 4.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 254, in test_new_package
> working_dir=tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_prepare_makes_parents OK 23ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch FAIL 2524ms
> log: {{{
> 3.658 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/.bzr/.
> 3.660 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x370b550> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/
> 3.695 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/.bzr/checkout/dirstate'
> 3.695 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1'
> 3.737 preparing to commit
> INFO Committing to: /tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/
> 3.755 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-2
> INFO Committed revision 1.
> 3.804 Committed revid jrandom at example.com-20120708071551-qhds0f27kh9uysj2 as revno 1.
> 3.815 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/.
> 3.818 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x370bd50> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/
> 3.859 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/checkout/dirstate'
> 3.860 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package'
> 3.909 export version <InventoryRevisionTree instance at 36eedd0, rev_id='jrandom at example.com-20120708071551-qhds0f27kh9uysj2'>
> 3.911 run bzr: ['merge-upstream', '--version', '4', '--package', 'bar', '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/project-4.tar.gz']
> 3.911 bazaar version: 2.6.0dev2
> 3.911 bzr arguments: [u'merge-upstream', u'--version', u'4', u'--package', u'bar', u'/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/project-4.tar.gz']
> 3.913 encoding stdout as sys.stdout encoding 'ascii'
> 3.942 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package'
> INFO No distribution specified, and no changelog, assuming 'debian'
> INFO Using version string 4.
> 4.001 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/.
> 4.015 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x36ee1d0> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/
> 4.054 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/checkout/dirstate'
> 4.054 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream'
> 4.080 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream'
> 4.221 Importing upstream version 4 from /tmp/tmpCIGsUB with parents {None: []}
> 4.286 export version <WorkingTree6 of /tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream>
> 5.357 imported bar version 4 component None as revid jrandom at example.com-20120708071552-vlucvpq0teqpn2r0, tagged upstream-4
> 5.394 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.394 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:']), 1)>
> 5.456 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.456 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:', 'jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), 0)>
> 5.475 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.475 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:', 'jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), 0)>
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 6.146 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 6.147 errors:
> 'No distribution specified, and no changelog, assuming \'debian\'\nUsing version string 4.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 262, in test_new_package_from_empty_branch
> working_dir=tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_prepare_purges_dir OK 17ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_strips_common_prefix OK 168ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_replaces_file_id_of_existing_file_with_target_tree OK 283ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_provides_stripped_message OK 232ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_no_set_message_config_option OK 230ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_secure_not_from_untrusted OK 99ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_revision_id OK 1ms
> bzrlib.plugins.builddeb.tests.test_config.DebuildSvnBpTests.test_from_properties OK 313ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_write_bug_fix_only OK 2ms
> bzrlib.plugins.builddeb.tests.test_dep3.GatherBugsAndAuthors.test_none OK 39ms
> bzrlib.plugins.builddeb.tests.test_dep3.GatherBugsAndAuthors.test_multiple_authors OK 260ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_uses_shell OK 123ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_uses_passed_wd OK 118ms
> bzrlib.plugins.builddeb.tests.blackbox.test_import_upstream.TestImportUpstream.test_import_upstream_with_branch_prior_tarball OK 4034ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_merge_upstream_available OK 49ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_export OK 2ms
> bzrlib.plugins.builddeb.tests.blackbox.test_import_dsc.TestImportDsc.test_import_dsc OK 4437ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_rename_of_file_in_target_tree_with_unversioned_replacement OK 268ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_leaves_existing_message OK 121ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_secure_not_from_branch OK 103ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_origin OK 1ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded_force OK 366ms
> bzrlib.plugins.builddeb.tests.test_dep3.GatherBugsAndAuthors.test_bugs OK 135ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_package.TestMergePackageBB.test_merge_package_shared_rev_conflict OK 2873ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_uses_local_over_global OK 80ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_build OK 109ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision FAIL 4667ms
> log: {{{
> 3.543 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/.
> 3.546 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x35a6f10> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/
> 3.583 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/checkout/dirstate'
> 3.583 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 3.626 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/
> 3.644 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2
> INFO Committed revision 1.
> 3.685 Committed revid jrandom at example.com-20120708071551-s9eafff3pknbx57n as revno 1.
> 3.705 export version <InventoryRevisionTree instance at 3645090, rev_id='jrandom at example.com-20120708071551-s9eafff3pknbx57n'>
> 3.743 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 3.766 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/.
> 3.785 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 3.785 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-s9eafff3pknbx57n']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')>
> 3.848 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3653390> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/
> 3.869 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/)
> 3.887 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/checkout/dirstate'
> 3.888 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 3.960 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 4.077 Importing upstream version 4 from /tmp/tmp4l301O with parents {None: ['jrandom at example.com-20120708071551-s9eafff3pknbx57n']}
> 4.131 export version <WorkingTree6 of /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5>
> 5.217 imported foo version 4 component None as revid jrandom at example.com-20120708071552-hk1tyk6x5wv9oees, tagged upstream-4
> 5.283 skip control directory '.bzr'
> 5.283 creating config directory: '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/home/.bazaar'
> 5.310 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/
> 5.328 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 5.388 Committed revid jrandom at example.com-20120708071552-znbaosnfqnsx72k5 as revno 3.
> 5.409 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 5.446 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/.
> 5.462 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/repository/')(RepositoryFormat2a())
> 5.462 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-s9eafff3pknbx57n']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')>
> 5.521 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x379c650> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/
> 5.559 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/)
> 5.561 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/checkout/dirstate'
> 5.562 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6'
> 5.656 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6'
> 5.675 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-7mwjie6y8ndr43ym-18}
>
> 5.678 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/
> 5.700 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7
> INFO Committed revision 2.
> 5.767 Committed revid jrandom at example.com-20120708071553-937jcqdq9yhr4dvn as revno 2.
> 5.789 export version <InventoryRevisionTree instance at 3793950, rev_id='jrandom at example.com-20120708071553-937jcqdq9yhr4dvn'>
> 5.806 run bzr: ['merge-upstream', '-rrevid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']
> 5.806 bazaar version: 2.6.0dev2
> 5.806 bzr arguments: [u'merge-upstream', u'-rrevid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']
> 5.824 Returning RevisionSpec RevisionSpec_revid for revid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn
> 5.824 encoding stdout as sys.stdout encoding 'ascii'
> 5.845 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 5.849 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> 5.876 Using /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6 for upstream-branch, taken from local.conf
> 5.876 Using /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6 for upstream-branch, taken from local.conf
> INFO Using version string 8.
> INFO Using uscan to look for the upstream tarball.
> INFO No watch file to use to retrieve upstream tarball.
> INFO Exporting upstream branch revision jrandom at example.com-20120708071553-937jcqdq9yhr4dvn to create the tarball
> 5.903 export version <InventoryRevisionTree instance at 364ad10, rev_id='jrandom at example.com-20120708071553-937jcqdq9yhr4dvn'>
> 5.965 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 5.997 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/.
> 6.008 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.009 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-hk1tyk6x5wv9oees']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')>
> 6.087 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x34a0fd0> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/
> 6.110 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/)
> 6.127 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/checkout/dirstate'
> 6.128 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream'
> 6.195 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream'
> 6.291 Importing upstream version 8 from /tmp/tmpBqbDvg with parents {None: ['jrandom at example.com-20120708071552-hk1tyk6x5wv9oees']}
> 6.296 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.296 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']), set(['null:', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n']), 1)>
> WARNING DuplicateID('Unversioned existing file', u'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2', u'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7', 'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-23', 'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19')
> 6.453 export version <WorkingTree6 of /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream>
> 7.443 imported foo version 8 component None as revid jrandom at example.com-20120708071555-2nurveybwettswv8, tagged upstream-8
> 7.459 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.460 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n']), 2)>
> 7.525 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.525 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn', 'null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n', 'jrandom at example.com-20120708071555-2nurveybwettswv8']), 0)>
> 7.541 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.541 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn', 'null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n', 'jrandom at example.com-20120708071555-2nurveybwettswv8']), 0)>
> 7.542 Base revid: 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 8.148 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 8.148 errors:
> 'Using distribution unstable\nUsing version string 8.\nUsing uscan to look for the upstream tarball.\nNo watch file to use to retrieve upstream tarball.\nExporting upstream branch revision jrandom at example.com-20120708071553-937jcqdq9yhr4dvn to create the tarball\nDuplicateID(\'Unversioned existing file\', u\'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2\', u\'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7\', \'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-23\', \'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19\')\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 214, in test_upstream_branch_revision
> working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_nonascii_filename OK 157ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_use_existing_preserves OK 23ms
> dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_from_two_lesser OK 1236ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_from_two_greater OK 1219ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file FAIL 4791ms
> log: {{{
> 3.611 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/.
> 3.634 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x372c8d0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/
> 3.672 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/checkout/dirstate'
> 3.672 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 3.731 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/
> 3.734 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2
> INFO Committed revision 1.
> 3.791 Committed revid jrandom at example.com-20120708071551-9tp59lp6hjy91bje as revno 1.
> 3.816 export version <InventoryRevisionTree instance at 373f710, rev_id='jrandom at example.com-20120708071551-9tp59lp6hjy91bje'>
> 3.837 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 3.876 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/.
> 3.895 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 3.895 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')>
> 3.975 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x373f2d0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/
> 4.001 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/)
> 4.017 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/checkout/dirstate'
> 4.018 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 4.074 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 4.185 Importing upstream version 4 from /tmp/tmpvUi808 with parents {None: ['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']}
> 4.239 export version <WorkingTree6 of /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5>
> 5.300 imported foo version 4 component None as revid jrandom at example.com-20120708071552-t0ek1pk7q00iwww2, tagged upstream-4
> 5.344 skip control directory '.bzr'
> 5.345 creating config directory: '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/home/.bazaar'
> 5.403 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/
> 5.405 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 5.465 Committed revid jrandom at example.com-20120708071553-t6s76gs302b4wr3z as revno 3.
> 5.502 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 5.546 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/.
> 5.549 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/repository/')(RepositoryFormat2a())
> 5.549 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')>
> 5.604 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3737150> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/
> 5.647 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/)
> 5.649 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/checkout/dirstate'
> 5.649 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6'
> 5.727 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6'
> 5.745 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-405l3m4w450g31nc-17}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-405l3m4w450g31nc-16}
>
> 5.747 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/
> 5.750 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-7
> INFO Committed revision 2.
> 5.874 Committed revid jrandom at example.com-20120708071553-ufstz8ejspbc1spb as revno 2.
> 5.894 export version <InventoryRevisionTree instance at 363be10, rev_id='jrandom at example.com-20120708071553-ufstz8ejspbc1spb'>
> 5.896 run bzr: ['merge-upstream', '--version', '8', '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/project-8.tar.gz']
> 5.896 bazaar version: 2.6.0dev2
> 5.896 bzr arguments: [u'merge-upstream', u'--version', u'8', u'/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/project-8.tar.gz']
> 5.918 encoding stdout as sys.stdout encoding 'ascii'
> 5.933 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 5.937 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> INFO Using version string 8.
> 6.028 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 6.072 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/.
> 6.102 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.102 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')>
> 6.176 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x362bfd0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/
> 6.228 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/)
> 6.250 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/checkout/dirstate'
> 6.250 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream'
> 6.325 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream'
> 6.434 Importing upstream version 8 from /tmp/tmpqkbj2F with parents {None: ['jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']}
> 6.511 export version <WorkingTree6 of /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream>
> 7.548 imported foo version 8 component None as revid jrandom at example.com-20120708071555-qt7ameexrgohu7eb, tagged upstream-8
> 7.573 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.573 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 1)>
> 7.690 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.690 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071555-qt7ameexrgohu7eb', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 0)>
> 7.706 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.706 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071555-qt7ameexrgohu7eb', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 0)>
> 7.707 Base revid: 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 8.355 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 8.356 errors:
> 'Using distribution unstable\nUsing version string 8.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 180, in test_smoke_renamed_file
> working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_ignores_commit_excluding_debian_changelog OK 212ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_use_existing_errors_if_not_present OK 23ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_package.TestMergePackageBB.test_pre_merge_hook_shared_rev_conflict OK 3047ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_hierarchy OK 88ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_description OK 4ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_takes_file_id_from_first_of_several_trees OK 324ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_build_fails OK 90ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_takes_file_id_from_another_tree OK 247ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_removes_files OK 155ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_set_message_returns_unicode OK 270ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_applied_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_write_normal_bug OK 1ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_provides_unstripped_message OK 227ms
> bzrlib.plugins.builddeb.tests.test_dh_make.dh_makeTests.test__get_tree_no_existing_branch OK 110ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_ignores_commit_specific_files OK 239ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_no_entry OK 113ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_forwarded OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_from_lesser OK 1147ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks FAIL 4834ms
> log: {{{
> 4.359 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/.
> 4.361 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3781dd0> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/
> 4.403 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/checkout/dirstate'
> 4.403 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 4.483 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/
> 4.485 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2
> INFO Committed revision 1.
> 4.525 Committed revid jrandom at example.com-20120708071552-tn4n399l9avnwvqa as revno 1.
> 4.553 export version <InventoryRevisionTree instance at 3564cd0, rev_id='jrandom at example.com-20120708071552-tn4n399l9avnwvqa'>
> 4.599 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 4.643 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/.
> 4.654 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 4.654 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')>
> 4.701 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3567110> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/
> 4.739 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/)
> 4.741 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/checkout/dirstate'
> 4.741 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 4.820 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 4.923 Importing upstream version 4 from /tmp/tmpfqMG8x with parents {None: ['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']}
> 5.000 export version <WorkingTree6 of /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5>
> 6.066 imported foo version 4 component None as revid jrandom at example.com-20120708071553-peh4vyb655wok2ul, tagged upstream-4
> 6.128 skip control directory '.bzr'
> 6.128 creating config directory: '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/home/.bazaar'
> 6.178 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/
> 6.180 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 6.256 Committed revid jrandom at example.com-20120708071553-fuhnl6xoo2xaunn8 as revno 3.
> 6.302 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 6.329 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/.
> 6.353 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/repository/')(RepositoryFormat2a())
> 6.353 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')>
> 6.405 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3698d50> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/
> 6.425 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/)
> 6.459 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/checkout/dirstate'
> 6.460 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6'
> 6.521 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6'
> 6.544 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-esw1ntcl3clkl1jx-16}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-esw1ntcl3clkl1jx-15}
>
> 6.563 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/
> 6.565 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-7
> INFO Committed revision 2.
> 6.642 Committed revid jrandom at example.com-20120708071554-o9egbko5qm5l12sk as revno 2.
> 6.662 export version <InventoryRevisionTree instance at 39099d0, rev_id='jrandom at example.com-20120708071554-o9egbko5qm5l12sk'>
> 6.665 run bzr: ['merge-upstream', '--version', '8', '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/project-8.tar.gz']
> 6.665 bazaar version: 2.6.0dev2
> 6.665 bzr arguments: [u'merge-upstream', u'--version', u'8', u'/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/project-8.tar.gz']
> 6.683 encoding stdout as sys.stdout encoding 'ascii'
> 6.702 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 6.723 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> INFO Using version string 8.
> 6.765 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 6.824 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/.
> 6.827 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.827 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071553-peh4vyb655wok2ul']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')>
> 6.901 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3909b10> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/
> 6.942 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/)
> 6.960 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/checkout/dirstate'
> 6.960 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream'
> 7.043 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream'
> 7.148 Importing upstream version 8 from /tmp/tmpiIiqSB with parents {None: ['jrandom at example.com-20120708071553-peh4vyb655wok2ul']}
> 7.225 export version <WorkingTree6 of /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream>
> 8.322 imported foo version 8 component None as revid jrandom at example.com-20120708071555-gd8vmoevm9ww3seh, tagged upstream-8
> 8.358 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.358 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 1)>
> 8.453 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.453 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071555-gd8vmoevm9ww3seh', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 0)>
> 8.473 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.473 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071555-gd8vmoevm9ww3seh', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 0)>
> 8.490 Base revid: 'jrandom at example.com-20120708071553-peh4vyb655wok2ul'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 9.154 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 9.154 errors:
> 'Using distribution unstable\nUsing version string 8.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 245, in test_hooks
> os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> bzrlib.plugins.builddeb.tests.test_dep3.DetermineAppliedUpstreamTests.test_merged OK 673ms
> bzrlib.plugins.builddeb.tests.test_builder.TestDebBuild.test_clean OK 2ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_allows_no_hook_defined OK 2ms
> bzrlib.plugins.builddeb.tests.test_config.DebuildSvnBpTests.test_from_svn_layout_file OK 353ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_write_debian_bug OK 1ms
> bzrlib.plugins.builddeb.tests.test_dep3.DetermineAppliedUpstreamTests.test_not_applied OK 250ms
> bzrlib.plugins.builddeb.tests.test_dh_make.dh_makeTests.test__get_tree_existing_branch OK 113ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_raises_when_hook_fails OK 83ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_rename_of_file_in_target_tree OK 245ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_when_hook_passes OK 93ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_ignores_commit_without_debian_changelog OK 119ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_new_upstream_import OK 1285ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_parse_error OK 99ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_last_updated OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_merge_from_lesser OK 1378ms
> bzrlib.plugins.builddeb.tests.test_dep3.FullDep3PatchTests.test_simple OK 189ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_create OK 708ms
> bzrlib.plugins.builddeb.tests.test_hooks.HookTests.test_run_hook_uses_cwd_by_default OK 116ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision_not_found OK 2338ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_first_version OK 797ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_branch_to_pull_upstream_from OK 1372ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_dir_rename_in_target_tree OK 262ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_merge_from_greater OK 1384ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_takes_file_id_from_target_tree OK 341ms
> bzrlib.plugins.builddeb.tests.test_commit_message.CommitMessageTests.test_set_message_with_bugs SKIP 3ms
> _LaunchpadConnectionFeature
>
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_authors OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_multiple_from_greater OK 1375ms
> bzrlib.plugins.builddeb.tests.test_dep3.DescribeOriginTests.test_no_public_branch OK 164ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_from_greater OK 1068ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_sync_when_diverged OK 1182ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_first_version OK 1158ms
> bzrlib.plugins.builddeb.tests.blackbox.test_import_dsc.TestImportDsc.test_import_dsc_incremental OK 8721ms
> bzrlib.plugins.builddeb.tests.blackbox.test_mark_uploaded.TestMarkUploaded.test_mark_uploaded_unkown_dist OK 377ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_second_version OK 1009ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_has_version OK 854ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_merge_new_upstream_from_lesser OK 1853ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_force_upstream OK 1409ms
> bzrlib.plugins.builddeb.tests.test_dh_make.dh_makeTests.test_import_upstream OK 1594ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_branch_to_pull_version_from OK 1275ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_sync_new_upstream OK 1780ms
> bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision_requires_upstream OK 2526ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_leaves_file_id_of_existing_file OK 224ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_second_version OK 893ms
> bzrlib.plugins.builddeb.tests.test_bzrtools_import.ImportArchiveTests.test_takes_file_ids_from_last_of_several_trees_if_needed OK 382ms
> bzrlib.plugins.builddeb.tests.test_config.DebBuildConfigTests.test_branch_over_all OK 118ms
> bzrlib.plugins.builddeb.tests.test_dep3.Dep3HeaderTests.test_bugs OK 1ms
> bzrlib.plugins.builddeb.tests.test_dep3.DescribeOriginTests.test_public_branch OK 165ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_native OK 4953ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_sync_new_upstream_force OK 1837ms
> bzrlib.plugins.builddeb.tests.test_dh_make.dh_makeTests.test_import_upstream_no_existing OK 1432ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_contained_versions OK 897ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_skipped_version OK 1022ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_native_two_unrelated OK 9414ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_native_two OK 9477ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream OK 971ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_get_parents_with_upstream_sync_when_diverged OK 1520ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_non_native_to_native OK 11519ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream_on_another OK 1350ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_initial_with_branch OK 3357ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_native_to_non_native OK 11923ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_pull_from_lesser_branch_no_upstream OK 1384ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_package_double OK 13439ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_initial_with_removed_debian OK 3352ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream_preserves_dot_bzrignore OK 980ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_symlink OK 6990ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_pull_from_lesser_branch_with_upstream OK 1373ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_package_init_from_other OK 13625ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_package_init_upstream_from_other OK 11925ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream_with_tarball OK 2129ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format1 OK 4496ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream_with_bzip2_tarball OK 2113ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_invalid_version_starting_non_digit OK 606ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_to_native_and_back_all_different_upstreams OK 18155ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_upstream_with_lzma_tarball OK 2336ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_is_native_version OK 994ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format1_native OK 3978ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_with_dash_in_version_number OK 2941ms
> bzrlib.plugins.builddeb.tests.test_merge_package.MergePackageTests.test_upstreams_not_diverged OK 2571ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_merge_by_version OK 1319ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_rename_and_replace OK 6622ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_two_roots OK 13523ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.StartCommitMergeHookTests.test_applied OK 1225ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestTreeUnapplyPatches.test_unapply_nothing_applied OK 134ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.UpstreamMergeChangelogLineTests.test_release OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_exists_different_bz2 OK 24ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_to_native_and_back_new_upstream OK 17778ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestTreeUnapplyPatches.test_unapply OK 1713ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.UpstreamMergeChangelogLineTests.test_plus OK 5ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_conditional_repack_tarball_same OK 5ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_upstream.test_version_specified OK 955ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_last_contained_version OK 892ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_target_exists OK 104ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_right_version OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetExportUpstreamRevisionTests.test_export_upstream_rev OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.LazyUpstreamBranchSourceTests.test_fetch_tarballs OK 225ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_delta_unknown OK 96ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_upstream.test_version_from_changelog OK 1107ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_rename_in_packaging_branch OK 5898ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_as_revisions_partially_missing OK 219ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_fetch_tarballs_bz2 OK 20ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestGatherOrigTarballs.test_single OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_refresh_snapshot_pre OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_distro_upstream_component OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_update_plus_rev OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_missing_versions OK 853ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_version_as_revision OK 313ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_none OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_get_commit_info_none OK 97ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_initial OK 2810ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_pull_upstream_from_branch OK 1081ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_tag_upstream_version OK 947ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_pristine_upstream_source_has_version OK 929ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_rename_on_top OK 6891ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_upstream_versions_as_revid OK 929ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_3way_conflicted OK 1351ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_revid_of_version OK 828ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_invalid_version_non_ascii OK 628ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_tarball_exists OK 3477ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_no_package OK 22ms
> bzrlib.plugins.builddeb.tests.test_upstream.ExtractTarballVersionTests.test_unknown_extension OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_without_snapshot OK 21ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_delta_gz OK 148ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_as_revisions_missing OK 120ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_fetch_tarballs OK 26ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestGatherOrigTarballs.test_no_dir OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_refresh_snapshot_post OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_distro_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_svn_tilde_rev OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_missing_file OK 3349ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_get_latest_version OK 251ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_no_changes OK 14ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_std OK 128ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_ubuntu_pocket OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_get_commit_info_iso_8859_1 OK 117ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_missing_dsc OK 10ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_prev_version_native OK 93ms
> bzrlib.plugins.builddeb.tests.test_util.SafeDecodeTests.test_iso_8859_1 OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_removes_leading_whitespace OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.TreeContainsUpstreamSourceTests.test_debian_dir_and_bzr_builddeb OK 101ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(dir) OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_nomerge_lq OK 347ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_ubuntu OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.tar.xz) OK 238ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.tar) OK 20ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.tar.bz2) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.zip) OK 15ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_normal_source_format_merge OK 123ms
> bzrlib.plugins.builddeb.tests.test_util.RecursiveCopyTests.test_recursive_copy OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_no_changes OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.tar.gz) OK 34ms
> bzrlib.plugins.builddeb.tests.test_util.TestExtractOrigTarballs.test_single_orig_tar_xz OK 233ms
> bzrlib.plugins.builddeb.config.DebBuildConfig.__init__ OK 28ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.tar.bz2) OK 22ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.zip) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.tar.gz) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.tar.lzma) OK 109ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(dir) OK 2ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_import_to_native_and_back_same_upstream OK 16407ms
> bzrlib.plugins.builddeb.tests.test_merge_package.MergePackageTests.test_deb_upstream_conflicts_with_ubu_packaging OK 2764ms
> bzrlib.plugins.builddeb.tests.test_merge_package.MergePackageTests.test_debian_upstream_older OK 3099ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestTreeUnapplyPatches.test_no_patches OK 62ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.UpstreamMergeChangelogLineTests.test_git_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_conditional_repack_tarball_different OK 21ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format3_quilt OK 5880ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_upstream.test_no_changelog OK 602ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestMergeHook.test_disabled_hook OK 1942ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.TestPackageVersion.test_ubuntu_with_epoch OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_with_unrelated_branch OK 12088ms
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_unapplied OK 324ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_other_shorter OK 1066ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_package.test_unkown_version OK 491ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_tag_name OK 610ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format3_quilt_bz2 OK 5417ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestChangelogHook.test_changelog_merge_hook_successful OK 624ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_this_shorter OK 988ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.StartCommitMergeHookTests.test_warning OK 1497ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.TestPackageVersion.test_debian_with_dash OK 1ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_removes_debian OK 2762ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_multiple_tarballs OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.ExtractTarballVersionTests.test_traditional_style OK 18ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_with_svn_snapshot_plus OK 1ms
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_poph_all_empty OK 349ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_repack_tarball_errors_unkown_format OK 24ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_has_version_partially_missing OK 183ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.FullSourceDistillerTests.test_distill_revision_tree OK 111ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_as_revisions OK 211ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_fetch_tarball_xz OK 149ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestMergeHook.test_auto_apply_patches_after_checkout OK 980ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestGatherOrigTarballs.test_multiple OK 9ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.TestPackageVersion.test_simple_debian OK 3ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_new_tagged_release OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_vprefix OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_svn_plus_rev OK 3ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_fetch_tarballs_not_found OK 169ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_lp_with_debian_links OK 80ms
> bzrlib.plugins.builddeb.tests.test_merge_package.MergePackageTests.test__upstream_version_data OK 1835ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_thanks_none OK 1ms
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_push_all_empty OK 311ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestMergeHook.test_auto_unapply_patches_after_update OK 354ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.TestPackageVersion.test_ubuntu_with_dash OK 1ms
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_series_all_empty OK 81ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_exports_branch OK 3072ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_package.test_from_string_package OK 561ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.NativeSourceDistillerTests.test_distill_target_exists OK 125ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_get_apt_command_for_source OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_with_snapshot_plus OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.NewTarballNameTests.test_zip OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_upstream_tag_name OK 70ms
> bzrlib.plugins.builddeb.tests.test_upstream.StackedUpstreamSourceTests.test_none OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_version_unicode_not_specified OK 8ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestIsUpstreamTag.test_svn_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_prefix OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_new_rev OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.UScanSourceTests.test_export_watchfile_top_level OK 102ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.FullSourceDistillerTests.test_distill_tarball_exists OK 291ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_debian_with_ubuntu_links OK 70ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_thanks OK 5ms
> bzrlib.plugins.builddeb.tests.test_util.ComponentFromOrigTarballTests.test_invalid_extension OK 1ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_package.test_simple_package OK 522ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_merge_lq OK 99ms
> bzrlib.plugins.builddeb.tests.test_util.FindLastDistributionTests.test_second OK 1ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.FullSourceDistillerTests.test_distill_working_tree_with_symlinks OK 105ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_native_source_format OK 111ms
> bzrlib.plugins.builddeb.tests.test_util.MoveFileTests.test_move_file_same_md5 OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_None OK 1ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.NativeSourceDistillerTests.test_distill_revision_tree OK 142ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_wrong_version OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_with_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.NewTarballNameTests.test_gz OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_tag_name_distro OK 76ms
> bzrlib.plugins.builddeb.tests.test_upstream.StackedUpstreamSourceTests.test_get_latest_version_first_wins OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_version_unicode OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.TestExtractOrigTarballs.test_multiple_tarballs OK 194ms
> bzrlib.plugins.builddeb.tests.test_util.WriteFileTests.test_write_file_same OK 3ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestIsUpstreamTag.test_simple_upstream OK 27ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_plain OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_svn_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.tar) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.tar.bz2) OK 9ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.zip) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.tar.gz) OK 3ms
> bzrlib.plugins.builddeb.tests.test_upstream.UScanSourceTests.test_export_watchfile_none OK 88ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_debian OK 73ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.tar.lzma) OK 122ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_extra_authors_utf8 OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ComponentFromOrigTarballTests.test_invalid_character OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_merge OK 62ms
> bzrlib.plugins.builddeb.tests.test_util.FindLastDistributionTests.test_only_unreleased OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_inconsistent OK 75ms
> bzrlib.plugins.builddeb.tests.test_util.MoveFileTests.test_move_file_non_extant OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.SourceFormatTests.test_source_format_newline OK 71ms
> bzrlib.plugins.builddeb.tests.test_util.TarballNameTests.test_tarball_name OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.WriteFileTests.test_write_file_different OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.zip) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.tar.gz) OK 11ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.tar.lzma) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(dir) OK 3ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_use_existing OK 2621ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_right_version_command_fails OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetExportUpstreamRevisionTests.test_export_upstream_rev_var OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.tar.xz) OK 117ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.tar) OK 4ms
> bzrlib.plugins.builddeb.tests.test_upstream.LazyUpstreamBranchSourceTests.test_get_latest_version OK 227ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_format_gz OK 60ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_local OK 2520ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_component OK 200ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_fetch_zip_tarballs_repack OK 5ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestIsUpstreamTag.test_distro_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_snapshot_nothing_new OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_git_upstream_component OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_nochangelog_merge OK 50ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_missing OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.UScanSourceTests.test__xml_report_extract_upstream_version OK 42ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_version_as_revision_no_revspec OK 23ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_normal_source_format OK 37ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_extra_authors_iso_8859_1 OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ParentDirTests.test_get_parent_dir OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_leaves_start_if_multiple OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_get_commit_message_info OK 33ms
> bzrlib.plugins.builddeb.tests.test_util.TestExtractOrigTarballs.test_single_orig_tar_gz OK 51ms
> bzrlib.plugins.builddeb.tests.test_tagging.TestDebVersionSort.test_sort OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.tar.gz) OK 5ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.tar.lzma) OK 78ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(dir) OK 10ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.tar.xz) OK 123ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.tar) OK 5ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_working_tree_with_symlinks OK 2437ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_right_version_is_native OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetExportUpstreamRevisionTests.test_snapshot_rev OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.LazyUpstreamBranchSourceTests.test_version_as_revision OK 143ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_format_unknown OK 41ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_component_as_revision OK 69ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_get_latest_version_parses OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestIsUpstreamTag.test_git_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_gibberish OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_simple_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.UScanSourceTests.test__xml_report_extract_upstream_version_warnings OK 30ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_version_as_revision_no_tag OK 27ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_extra_authors_no_changes OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ComponentFromOrigTarballTests.test_base_tarball OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_changelog_not_added OK 28ms
> bzrlib.plugins.builddeb.tests.test_util.FindLastDistributionTests.test_empty OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_default OK 50ms
> bzrlib.plugins.builddeb.tests.test_util.LookupDistributionTests.test_lookup_ubuntu OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_sync_to_other_branch OK 17896ms
> bzrlib.plugins.builddeb.tests.test_util.SourceFormatTests.test_source_format OK 56ms
> bzrlib.plugins.builddeb.tests.test_util.SuiteToDistributionTests.test_lookup_other OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.TreeContainsUpstreamSourceTests.test_with_unversioned_extra_data OK 36ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.tar.xz) OK 98ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.tar) OK 10ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.tar.bz2) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.zip) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.tar.gz) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.tar.lzma) OK 81ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_transport OK 1704ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_symlink_naughty OK 78ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_unreleased OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.LookupDistributionTests.test_lookup_other OK 8ms
> bzrlib.plugins.builddeb.tests.test_util.SourceFormatTests.test_no_source_format_file OK 38ms
> bzrlib.plugins.builddeb.tests.test_util.SuiteToDistributionTests.test_lookup_debian OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.TreeContainsUpstreamSourceTests.test_empty OK 29ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.tar.bz2) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.zip) OK 4ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.tar.gz) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.tar.lzma) OK 38ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(dir) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.tar.xz) OK 53ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_pull_from_other OK 18101ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format3_quilt_multiple_upstream_tarballs OK 1744ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_unsorted OK 175ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.OneZeroSourceExtractorTests.test_extract_format3_native OK 1089ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_not_valid_changelog OK 274ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestMergeHook.test_auto_apply_patches_after_update OK 474ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.TestPackageVersion.test_simple_ubuntu OK 2ms
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_series_all OK 29ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_package.test_missing_version OK 132ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.FullSourceDistillerTests.test_distill_target_exists OK 17ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.NativeSourceDistillerTests.test_distill_removes_builddeb_dir OK 36ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_right_version_xz OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_non_numeric_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.NewTarballNameTests.test_bz2 OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_format_xz OK 28ms
> bzrlib.plugins.builddeb.tests.test_upstream.StackedUpstreamSourceTests.test_fetch_tarballs_first_wins OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_version OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestIsUpstreamTag.test_plain_version OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_package_prefix OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_simple_upstream_component OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.UScanSourceTests.test_export_watchfile OK 34ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.StartCommitMergeHookTests.test_unapplied OK 504ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_version_as_revisions OK 99ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_extra_authors_none OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ComponentFromOrigTarballTests.test_component OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_lq_unversioned_debian_symlink OK 30ms
> bzrlib.plugins.builddeb.tests.test_util.FindLastDistributionTests.test_first OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_empty OK 15ms
> bzrlib.plugins.builddeb.tests.test_util.MoveFileTests.test_move_file_diff_md5 OK 2ms
> bzrlib.plugins.builddeb.tests.test_util.SourceFormatTests.test_source_format_file_unversioned OK 16ms
> bzrlib.plugins.builddeb.tests.test_util.SuiteToDistributionTests.test_lookup_ubuntu OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.TreeContainsUpstreamSourceTests.test_with_upstream_source OK 18ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.tar.lzma) OK 26ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(dir) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.tar.xz) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.tar) OK 2ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.tar.bz2) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.zip) OK 2ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_newERROR 205ms
> log: {{{
> 52.956 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/.bzr/.
> 52.958 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3dc1090> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/
> 52.964 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/.bzr/checkout/dirstate'
> 52.965 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/test_merge_upstream.py", line 87, in test_add_new
> changelog_add_new_version(tree, "1.0", "sid", None, "somepkg")
> File "/«PKGBUILDDIR»/merge_upstream.py", line 111, in changelog_add_new_version
> raise DchError("Adding changelog entry failed: %s" % stderr)
> DchError: There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
>
> bzrlib.plugins.builddeb.tests.test_quilt.QuiltTests.test_applied_empty OK 26ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_exists_not_force_gz OK 3ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.FullSourceDistillerTests.test_distill_no_tarball OK 18ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_merge_upstream_branches OK 12852ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_parsechangelog_with_latin1 OK 126ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_top_level OK 691ms
> bzrlib.plugins.builddeb.tests.test_upstream.AptSourceTests.test_apt_provider_right_version_bz2 OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetExportUpstreamRevisionTests.test_export_upstream_rev_not_set OK 1ms
> bzrlib.plugins.builddeb.tests.test_import_dsc.DistributionBranchTests.test_tag_version OK 143ms
> bzrlib.plugins.builddeb.tests.test_upstream.LazyUpstreamBranchSourceTests.test_fetch_tarballs_not_found OK 41ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_pristine_tar_format_bz2 OK 17ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version_as_revisions_single OK 33ms
> bzrlib.plugins.builddeb.tests.test_upstream.TarfileSourceTests.test_fetch_tarballs_not_present OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestGatherOrigTarballs.test_utf8_invalid_file OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_snapshot_none_existing OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagVersion.test_git_upstream OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_update_tilde_rev OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_version_as_revision_invalid_revspec OK 18ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_extra_authors OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_get_commit_info_utf8 OK 19ms
> bzrlib.plugins.builddeb.tests.test_merge_changelog.TestMergeChangelog.test_3way_merge OK 242ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_missing_target OK 653ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_symlink OK 69ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_unknown OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.LookupDistributionTests.test_lookup_debian OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.SafeDecodeTests.test_utf8 OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_removes_star_if_one OK 1ms
> bzrlib.plugins.builddeb.tests.test_merge_package.MergePackageTests.test_debian_upstream_newer OK 609ms
> bzrlib.plugins.builddeb.tests.test_util.TreeContainsUpstreamSourceTests.test_debian_dir_only OK 18ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_create_old_tarball(.tar.gz) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(.tar.lzma) OK 26ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(dir) OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_result_extant(.tar.xz) OK 41ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.tar) OK 5ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_not_dir(.tar.bz2) OK 4ms
> bzrlib.plugins.builddeb.tests.test_merge_quilt.TestMergeHook.test_diverged_patches OK 454ms
> bzrlib.plugins.builddeb.tests.test_merge_upstream.UpstreamMergeChangelogLineTests.test_bzr_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball_extra.TestRepackTarballExtra.test_conditional_repack_different_formats OK 4ms
> bzrlib.plugins.builddeb.tests.test_revspec.TestRevisionSpec_upstream.test_from_string_package OK 125ms
> bzrlib.plugins.builddeb.tests.test_source_distiller.MergeModeDistillerTests.test_distill_no_tarball OK 16ms
> /«PKGBUILDDIR»/source_distiller.py:86: DeprecationWarning: bzrlib.workingtree_4.WorkingTree6._get_inventory was deprecated in version 2.5.0.
> for (dp, ie) in self.tree.inventory.iter_entries():
> bzrlib.plugins.builddeb.tests.test_source_distiller.NativeSourceDistillerTests.test_distill_working_tree_with_symlinks OK 19ms
> bzrlib.plugins.builddeb.tests.test_upstream.ExtractTarballVersionTests.test_debian_style OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.GetRevisionSnapshotTests.test_with_svn_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_has_version_multiple OK 51ms
> bzrlib.plugins.builddeb.tests.test_upstream.PristineTarSourceTests.test_version OK 16ms
> bzrlib.plugins.builddeb.tests.test_upstream.StackedUpstreamSourceTests.test_repr OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestGatherOrigTarballs.test_empty OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamBranchVersion.test_new_tag_refresh_snapshot OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamTagToVersion.test_unicode OK 1ms
> bzrlib.plugins.builddeb.tests.test_upstream.TestUpstreamVersionAddRevision.test_svn_new_rev OK 2ms
> bzrlib.plugins.builddeb.tests.test_upstream.UpstreamBranchSourceTests.test_fetch_tarballs OK 32ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_bugs_fixed_lp OK 17ms
> bzrlib.plugins.builddeb.tests.test_util.ChangelogInfoTests.test_find_thanks_no_changes OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.DgetTests.test_dget_changes OK 634ms
> bzrlib.plugins.builddeb.tests.test_util.FindChangelogTests.test_find_changelog_nochangelog OK 22ms
> bzrlib.plugins.builddeb.tests.test_util.FindPreviousUploadTests.test_find_previous_upload_debian OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.GuessBuildTypeTests.test_no_upstream_source OK 18ms
> bzrlib.plugins.builddeb.tests.test_util.MoveFileTests.test_move_file_samefile OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.StripChangelogMessageTests.test_empty_changes OK 1ms
> bzrlib.plugins.builddeb.tests.test_util.TestExtractOrigTarballs.test_single_orig_tar_bz2 OK 24ms
> bzrlib.plugins.builddeb.tests.test_util.WriteFileTests.test_write_non_extant OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_contents(dir) OK 4ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_creates_new(.tar.xz) OK 41ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_non_extant(.tar) OK 3ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir(.tar.bz2) OK 4ms
> bzrlib.plugins.builddeb.tests.test_repack_tarball.TestRepackTarball.test_repack_tarball_with_target_dir_exists(.zip) OK 4ms
> ======================================================================
> ERROR: bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 52.956 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/.bzr/.
> 52.958 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3dc1090> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/
> 52.964 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work/.bzr/checkout/dirstate'
> 52.965 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.test_merge_upstream.ChangelogAddNewVersionTests.test_add_new/work'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/test_merge_upstream.py", line 87, in test_add_new
> changelog_add_new_version(tree, "1.0", "sid", None, "somepkg")
> File "/«PKGBUILDDIR»/merge_upstream.py", line 111, in changelog_add_new_version
> raise DchError("Adding changelog entry failed: %s" % stderr)
> DchError: There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
>
> ======================================================================
> FAIL: bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 3.442 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/.
> 3.468 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x29b4310> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/
> 3.500 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/checkout/dirstate'
> 3.500 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1'
> 3.539 preparing to commit
> INFO Committing to: /tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/
> 3.561 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-2
> INFO Committed revision 1.
> 3.602 Committed revid jrandom at example.com-20120708071551-n2goabj6s2kmzhc1 as revno 1.
> 3.622 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1'
> 3.661 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/.
> 3.680 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 3.680 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-n2goabj6s2kmzhc1']) repo:CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package-1/.bzr/repository/')>
> 3.722 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x37d4610> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/
> 3.759 created new branch BzrBranch7(file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/)
> 3.779 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/checkout/dirstate'
> 3.780 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> 3.845 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> 3.865 export version <InventoryRevisionTree instance at 37d0310, rev_id='jrandom at example.com-20120708071551-n2goabj6s2kmzhc1'>
> 3.883 run bzr: ['merge-upstream', '--version', '4', '--package', 'bar', '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/project-4.tar.gz']
> 3.883 bazaar version: 2.6.0dev2
> 3.883 bzr arguments: [u'merge-upstream', u'--version', u'4', u'--package', u'bar', u'/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/project-4.tar.gz']
> 3.884 encoding stdout as sys.stdout encoding 'ascii'
> 3.904 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package'
> INFO No distribution specified, and no changelog, assuming 'debian'
> INFO Using version string 4.
> 3.967 creating repository in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/.
> 3.969 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x37e1950> in file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/
> 4.010 trying to create missing lock '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/checkout/dirstate'
> 4.023 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream'
> 4.052 opening working tree '/tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream'
> 4.159 Importing upstream version 4 from /tmp/tmp6R06Ge with parents {None: []}
> 4.237 export version <WorkingTree6 of /tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream>
> 5.330 imported bar version 4 component None as revid jrandom at example.com-20120708071552-ifsahqjni58qt6ri, tagged upstream-4
> 5.351 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.351 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:']), 1)>
> 5.413 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.413 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.436 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.436 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.451 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.451 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), set(['null:', 'jrandom at example.com-20120708071552-ifsahqjni58qt6ri']), 0)>
> 5.452 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/tmpPa1xuV/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-b_EW_1.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.452 fetching: <SearchResult search:(set(['null:']), set(['null:']), 0)>
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 6.114 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 6.114 errors:
> 'No distribution specified, and no changelog, assuming \'debian\'\nUsing version string 4.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 254, in test_new_package
> working_dir=tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> ======================================================================
> FAIL: bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 3.658 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/.bzr/.
> 3.660 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x370b550> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/
> 3.695 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/.bzr/checkout/dirstate'
> 3.695 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1'
> 3.737 preparing to commit
> INFO Committing to: /tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-1/
> 3.755 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch-2
> INFO Committed revision 1.
> 3.804 Committed revid jrandom at example.com-20120708071551-qhds0f27kh9uysj2 as revno 1.
> 3.815 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/.
> 3.818 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x370bd50> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/
> 3.859 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/checkout/dirstate'
> 3.860 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package'
> 3.909 export version <InventoryRevisionTree instance at 36eedd0, rev_id='jrandom at example.com-20120708071551-qhds0f27kh9uysj2'>
> 3.911 run bzr: ['merge-upstream', '--version', '4', '--package', 'bar', '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/project-4.tar.gz']
> 3.911 bazaar version: 2.6.0dev2
> 3.911 bzr arguments: [u'merge-upstream', u'--version', u'4', u'--package', u'bar', u'/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/project-4.tar.gz']
> 3.913 encoding stdout as sys.stdout encoding 'ascii'
> 3.942 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package'
> INFO No distribution specified, and no changelog, assuming 'debian'
> INFO Using version string 4.
> 4.001 creating repository in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/.
> 4.015 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x36ee1d0> in file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/
> 4.054 trying to create missing lock '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/checkout/dirstate'
> 4.054 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream'
> 4.080 opening working tree '/tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream'
> 4.221 Importing upstream version 4 from /tmp/tmpCIGsUB with parents {None: []}
> 4.286 export version <WorkingTree6 of /tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream>
> 5.357 imported bar version 4 component None as revid jrandom at example.com-20120708071552-vlucvpq0teqpn2r0, tagged upstream-4
> 5.394 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.394 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:']), 1)>
> 5.456 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.456 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:', 'jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), 0)>
> 5.475 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/tmpYRidRJ/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-AK9Hlz.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_new_package_from_empty_branch/work/package/.bzr/repository/')(RepositoryFormat2a())
> 5.475 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), set(['null:', 'jrandom at example.com-20120708071552-vlucvpq0teqpn2r0']), 0)>
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 6.146 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 6.147 errors:
> 'No distribution specified, and no changelog, assuming \'debian\'\nUsing version string 4.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 262, in test_new_package_from_empty_branch
> working_dir=tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> ======================================================================
> FAIL: bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 3.543 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/.
> 3.546 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x35a6f10> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/
> 3.583 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/checkout/dirstate'
> 3.583 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 3.626 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/
> 3.644 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2
> INFO Committed revision 1.
> 3.685 Committed revid jrandom at example.com-20120708071551-s9eafff3pknbx57n as revno 1.
> 3.705 export version <InventoryRevisionTree instance at 3645090, rev_id='jrandom at example.com-20120708071551-s9eafff3pknbx57n'>
> 3.743 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 3.766 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/.
> 3.785 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 3.785 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-s9eafff3pknbx57n']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')>
> 3.848 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3653390> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/
> 3.869 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/)
> 3.887 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/checkout/dirstate'
> 3.888 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 3.960 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 4.077 Importing upstream version 4 from /tmp/tmp4l301O with parents {None: ['jrandom at example.com-20120708071551-s9eafff3pknbx57n']}
> 4.131 export version <WorkingTree6 of /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5>
> 5.217 imported foo version 4 component None as revid jrandom at example.com-20120708071552-hk1tyk6x5wv9oees, tagged upstream-4
> 5.283 skip control directory '.bzr'
> 5.283 creating config directory: '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/home/.bazaar'
> 5.310 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/
> 5.328 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 5.388 Committed revid jrandom at example.com-20120708071552-znbaosnfqnsx72k5 as revno 3.
> 5.409 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1'
> 5.446 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/.
> 5.462 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/repository/')(RepositoryFormat2a())
> 5.462 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-s9eafff3pknbx57n']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-1/.bzr/repository/')>
> 5.521 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x379c650> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/
> 5.559 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/)
> 5.561 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/checkout/dirstate'
> 5.562 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6'
> 5.656 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6'
> 5.675 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-7mwjie6y8ndr43ym-18}
>
> 5.678 preparing to commit
> INFO Committing to: /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/
> 5.700 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7
> INFO Committed revision 2.
> 5.767 Committed revid jrandom at example.com-20120708071553-937jcqdq9yhr4dvn as revno 2.
> 5.789 export version <InventoryRevisionTree instance at 3793950, rev_id='jrandom at example.com-20120708071553-937jcqdq9yhr4dvn'>
> 5.806 run bzr: ['merge-upstream', '-rrevid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']
> 5.806 bazaar version: 2.6.0dev2
> 5.806 bzr arguments: [u'merge-upstream', u'-rrevid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']
> 5.824 Returning RevisionSpec RevisionSpec_revid for revid:jrandom at example.com-20120708071553-937jcqdq9yhr4dvn
> 5.824 encoding stdout as sys.stdout encoding 'ascii'
> 5.845 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 5.849 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> 5.876 Using /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6 for upstream-branch, taken from local.conf
> 5.876 Using /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6 for upstream-branch, taken from local.conf
> INFO Using version string 8.
> INFO Using uscan to look for the upstream tarball.
> INFO No watch file to use to retrieve upstream tarball.
> INFO Exporting upstream branch revision jrandom at example.com-20120708071553-937jcqdq9yhr4dvn to create the tarball
> 5.903 export version <InventoryRevisionTree instance at 364ad10, rev_id='jrandom at example.com-20120708071553-937jcqdq9yhr4dvn'>
> 5.965 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5'
> 5.997 creating repository in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/.
> 6.008 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.009 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-hk1tyk6x5wv9oees']) repo:CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')>
> 6.087 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x34a0fd0> in file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/
> 6.110 created new branch BzrBranch7(file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/)
> 6.127 trying to create missing lock '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/checkout/dirstate'
> 6.128 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream'
> 6.195 opening working tree '/tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream'
> 6.291 Importing upstream version 8 from /tmp/tmpBqbDvg with parents {None: ['jrandom at example.com-20120708071552-hk1tyk6x5wv9oees']}
> 6.296 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-6/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.296 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn']), set(['null:', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n']), 1)>
> WARNING DuplicateID('Unversioned existing file', u'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2', u'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7', 'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-23', 'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19')
> 6.453 export version <WorkingTree6 of /tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream>
> 7.443 imported foo version 8 component None as revid jrandom at example.com-20120708071555-2nurveybwettswv8, tagged upstream-8
> 7.459 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.460 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n']), 2)>
> 7.525 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.525 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn', 'null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n', 'jrandom at example.com-20120708071555-2nurveybwettswv8']), 0)>
> 7.541 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/tmpT4cz7S/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-6BgJSn.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-5/.bzr/repository/')(RepositoryFormat2a())
> 7.541 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-2nurveybwettswv8']), set(['jrandom at example.com-20120708071553-937jcqdq9yhr4dvn', 'null:', 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees', 'jrandom at example.com-20120708071551-s9eafff3pknbx57n', 'jrandom at example.com-20120708071555-2nurveybwettswv8']), 0)>
> 7.542 Base revid: 'jrandom at example.com-20120708071552-hk1tyk6x5wv9oees'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 8.148 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 8.148 errors:
> 'Using distribution unstable\nUsing version string 8.\nUsing uscan to look for the upstream tarball.\nNo watch file to use to retrieve upstream tarball.\nExporting upstream branch revision jrandom at example.com-20120708071553-937jcqdq9yhr4dvn to create the tarball\nDuplicateID(\'Unversioned existing file\', u\'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-2\', u\'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_upstream_branch_revision-7\', \'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-23\', \'bzrlib.plugins.build-20120708071548-7mwjie6y8ndr43ym-19\')\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 214, in test_upstream_branch_revision
> working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> ======================================================================
> FAIL: bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 3.611 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/.
> 3.634 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x372c8d0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/
> 3.672 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/checkout/dirstate'
> 3.672 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 3.731 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/
> 3.734 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2
> INFO Committed revision 1.
> 3.791 Committed revid jrandom at example.com-20120708071551-9tp59lp6hjy91bje as revno 1.
> 3.816 export version <InventoryRevisionTree instance at 373f710, rev_id='jrandom at example.com-20120708071551-9tp59lp6hjy91bje'>
> 3.837 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 3.876 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/.
> 3.895 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 3.895 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')>
> 3.975 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x373f2d0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/
> 4.001 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/)
> 4.017 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/checkout/dirstate'
> 4.018 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 4.074 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 4.185 Importing upstream version 4 from /tmp/tmpvUi808 with parents {None: ['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']}
> 4.239 export version <WorkingTree6 of /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5>
> 5.300 imported foo version 4 component None as revid jrandom at example.com-20120708071552-t0ek1pk7q00iwww2, tagged upstream-4
> 5.344 skip control directory '.bzr'
> 5.345 creating config directory: '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/home/.bazaar'
> 5.403 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/
> 5.405 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 5.465 Committed revid jrandom at example.com-20120708071553-t6s76gs302b4wr3z as revno 3.
> 5.502 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1'
> 5.546 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/.
> 5.549 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/repository/')(RepositoryFormat2a())
> 5.549 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-1/.bzr/repository/')>
> 5.604 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3737150> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/
> 5.647 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/)
> 5.649 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/.bzr/checkout/dirstate'
> 5.649 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6'
> 5.727 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6'
> 5.745 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-405l3m4w450g31nc-17}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-405l3m4w450g31nc-16}
>
> 5.747 preparing to commit
> INFO Committing to: /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-6/
> 5.750 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-7
> INFO Committed revision 2.
> 5.874 Committed revid jrandom at example.com-20120708071553-ufstz8ejspbc1spb as revno 2.
> 5.894 export version <InventoryRevisionTree instance at 363be10, rev_id='jrandom at example.com-20120708071553-ufstz8ejspbc1spb'>
> 5.896 run bzr: ['merge-upstream', '--version', '8', '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/project-8.tar.gz']
> 5.896 bazaar version: 2.6.0dev2
> 5.896 bzr arguments: [u'merge-upstream', u'--version', u'8', u'/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/project-8.tar.gz']
> 5.918 encoding stdout as sys.stdout encoding 'ascii'
> 5.933 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 5.937 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> INFO Using version string 8.
> 6.028 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5'
> 6.072 creating repository in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/.
> 6.102 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.102 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']) repo:CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')>
> 6.176 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x362bfd0> in file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/
> 6.228 created new branch BzrBranch7(file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/)
> 6.250 trying to create missing lock '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/checkout/dirstate'
> 6.250 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream'
> 6.325 opening working tree '/tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream'
> 6.434 Importing upstream version 8 from /tmp/tmpqkbj2F with parents {None: ['jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']}
> 6.511 export version <WorkingTree6 of /tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream>
> 7.548 imported foo version 8 component None as revid jrandom at example.com-20120708071555-qt7ameexrgohu7eb, tagged upstream-8
> 7.573 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.573 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 1)>
> 7.690 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.690 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071555-qt7ameexrgohu7eb', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 0)>
> 7.706 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/tmp4w436P/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-Y9OknK.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_smoke_renamed_file-5/.bzr/repository/')(RepositoryFormat2a())
> 7.706 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-qt7ameexrgohu7eb']), set(['jrandom at example.com-20120708071551-9tp59lp6hjy91bje', 'null:', 'jrandom at example.com-20120708071555-qt7ameexrgohu7eb', 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2']), 0)>
> 7.707 Base revid: 'jrandom at example.com-20120708071552-t0ek1pk7q00iwww2'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 8.355 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 8.356 errors:
> 'Using distribution unstable\nUsing version string 8.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 180, in test_smoke_renamed_file
> working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> ======================================================================
> FAIL: bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks
> ----------------------------------------------------------------------
> _StringException: log: {{{
> 4.359 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/.
> 4.361 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3781dd0> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/
> 4.403 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/checkout/dirstate'
> 4.403 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 4.483 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/
> 4.485 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2
> INFO Committed revision 1.
> 4.525 Committed revid jrandom at example.com-20120708071552-tn4n399l9avnwvqa as revno 1.
> 4.553 export version <InventoryRevisionTree instance at 3564cd0, rev_id='jrandom at example.com-20120708071552-tn4n399l9avnwvqa'>
> 4.599 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 4.643 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/.
> 4.654 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 4.654 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')>
> 4.701 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3567110> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/
> 4.739 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/)
> 4.741 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/checkout/dirstate'
> 4.741 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 4.820 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 4.923 Importing upstream version 4 from /tmp/tmpfqMG8x with parents {None: ['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']}
> 5.000 export version <WorkingTree6 of /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5>
> 6.066 imported foo version 4 component None as revid jrandom at example.com-20120708071553-peh4vyb655wok2ul, tagged upstream-4
> 6.128 skip control directory '.bzr'
> 6.128 creating config directory: '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/home/.bazaar'
> 6.178 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/
> 6.180 Selecting files for commit with filter None
> INFO added debian
> INFO added debian/changelog
> INFO added debian/control
> INFO Committed revision 3.
> 6.256 Committed revid jrandom at example.com-20120708071553-fuhnl6xoo2xaunn8 as revno 3.
> 6.302 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1'
> 6.329 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/.
> 6.353 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/repository/')(RepositoryFormat2a())
> 6.353 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071552-tn4n399l9avnwvqa']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-1/.bzr/repository/')>
> 6.405 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3698d50> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/
> 6.425 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/)
> 6.459 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/.bzr/checkout/dirstate'
> 6.460 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6'
> 6.521 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6'
> 6.544 rename_one:
> from_id {bzrlib.plugins.build-20120708071548-esw1ntcl3clkl1jx-16}
> from_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2'
> to_rel: 'bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-7'
> to_dir ''
> to_dir_id {tree_root-20120708071548-esw1ntcl3clkl1jx-15}
>
> 6.563 preparing to commit
> INFO Committing to: /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-6/
> 6.565 Selecting files for commit with filter None
> INFO added bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2
> INFO renamed bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-2 => bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-7
> INFO Committed revision 2.
> 6.642 Committed revid jrandom at example.com-20120708071554-o9egbko5qm5l12sk as revno 2.
> 6.662 export version <InventoryRevisionTree instance at 39099d0, rev_id='jrandom at example.com-20120708071554-o9egbko5qm5l12sk'>
> 6.665 run bzr: ['merge-upstream', '--version', '8', '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/project-8.tar.gz']
> 6.665 bazaar version: 2.6.0dev2
> 6.665 bzr arguments: [u'merge-upstream', u'--version', u'8', u'/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/project-8.tar.gz']
> 6.683 encoding stdout as sys.stdout encoding 'ascii'
> 6.702 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 6.723 Using 'debian/changelog' to get package information
> INFO Using distribution unstable
> INFO Using version string 8.
> 6.765 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5'
> 6.824 creating repository in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/.
> 6.827 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a())
> 6.827 fetching: <PendingAncestryResult heads:frozenset(['jrandom at example.com-20120708071553-peh4vyb655wok2ul']) repo:CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')>
> 6.901 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3909b10> in file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/
> 6.942 created new branch BzrBranch7(file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/)
> 6.960 trying to create missing lock '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/checkout/dirstate'
> 6.960 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream'
> 7.043 opening working tree '/tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream'
> 7.148 Importing upstream version 8 from /tmp/tmpiIiqSB with parents {None: ['jrandom at example.com-20120708071553-peh4vyb655wok2ul']}
> 7.225 export version <WorkingTree6 of /tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream>
> 8.322 imported foo version 8 component None as revid jrandom at example.com-20120708071555-gd8vmoevm9ww3seh, tagged upstream-8
> 8.358 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.358 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 1)>
> 8.453 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.453 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071555-gd8vmoevm9ww3seh', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 0)>
> 8.473 Using fetch logic to copy between CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/tmpC42EGW/upstream/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///tmp/testbzr-12QCKi.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks/work/bzrlib.plugins.builddeb.tests.blackbox.test_merge_upstream.TestMergeUpstream.test_hooks-5/.bzr/repository/')(RepositoryFormat2a())
> 8.473 fetching: <SearchResult search:(set(['jrandom at example.com-20120708071555-gd8vmoevm9ww3seh']), set(['jrandom at example.com-20120708071553-peh4vyb655wok2ul', 'null:', 'jrandom at example.com-20120708071555-gd8vmoevm9ww3seh', 'jrandom at example.com-20120708071552-tn4n399l9avnwvqa']), 0)>
> 8.490 Base revid: 'jrandom at example.com-20120708071553-peh4vyb655wok2ul'
> INFO All changes applied successfully.
> INFO There was an error using dch: Adding changelog entry failed: Can't call method "stable" without a package or object reference at /usr/bin/dch line 487.
> .
> 9.154 Traceback (most recent call last):
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1251, in run_bzr_catch_user_errors
> return run_bzr(argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1141, in run_bzr
> ret = run(*run_argv)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/«PKGBUILDDIR»/cmds.py", line 855, in run
> distribution_name, changelog)
> File "/«PKGBUILDDIR»/cmds.py", line 625, in _add_changelog_entry
> raise BzrCommandError('Adding a new changelog stanza after the '
> BzrCommandError: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.
>
> 9.154 errors:
> 'Using distribution unstable\nUsing version string 8.\nAll changes applied successfully.\nThere was an error using dch: Adding changelog entry failed: Can\'t call method "stable" without a package or object reference at /usr/bin/dch line 487.\n.\nbzr: ERROR: Adding a new changelog stanza after the merge had completed failed. Add the new changelog entry yourself, review the merge, and then commit.\n'
> }}}
>
> Traceback (most recent call last):
> File "/«PKGBUILDDIR»/tests/blackbox/test_merge_upstream.py", line 245, in test_hooks
> os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
> AssertionError: Unexpected return code
> not equal:
> a = 0
> b = 3
>
> ----------------------------------------------------------------------
> Ran 532 tests in 56.022s
>
> FAILED (failures=5, errors=1)
> 1 test skipped
> make: *** [build-python2.7] Error 1
The full build log is available from:
http://people.debian.org/~lucas/logs/2012/07/08/bzr-builddeb_2.8.4_unstable.log
A list of current common problems and possible solutions is available at
http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute!
About the archive rebuild: The rebuild was done on EC2 VM instances from
Amazon Web Services, using a clean, minimal and up-to-date chroot. Every
failed build was retried once to eliminate random failures.
More information about the Pkg-bazaar-maint
mailing list