Rev 3704: (vila) Fixes for OSX test suite in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Sep 12 08:00:32 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3704
revision-id: pqm at pqm.ubuntu.com-20080911142801-kssx0sqg51xsvqzr
parent: pqm at pqm.ubuntu.com-20080911061059-svzqfejar17ui4zw
parent: v.ladeuil+lp at free.fr-20080911135002-0jhk4hv76qsq96ga
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-09-11 15:28:01 +0100
message:
(vila) Fixes for OSX test suite
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3703.1.1
revision-id: v.ladeuil+lp at free.fr-20080911135002-0jhk4hv76qsq96ga
parent: pqm at pqm.ubuntu.com-20080911061059-svzqfejar17ui4zw
parent: v.ladeuil+lp at free.fr-20080911134735-djcymv1155gfrtwf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2008-09-11 15:50:02 +0200
message:
Fixes for OSX test suite
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3638.3.20
revision-id: v.ladeuil+lp at free.fr-20080911134735-djcymv1155gfrtwf
parent: v.ladeuil+lp at free.fr-20080911133741-k6vq2h1ms5ez6p9x
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 15:47:35 +0200
message:
Update NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3638.3.19
revision-id: v.ladeuil+lp at free.fr-20080911133741-k6vq2h1ms5ez6p9x
parent: v.ladeuil+lp at free.fr-20080911105331-eoyl4qrfpu2v0pj4
parent: pqm at pqm.ubuntu.com-20080911061059-svzqfejar17ui4zw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 15:37:41 +0200
message:
Merge bzr.dev
added:
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/readdir.h readdir.h-20060609152855-rm6v321vuaqyh9tu-2
bzrlib/tests/test_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
bzrlib/transport/log.py log.py-20080902041816-vh8x5yt5nvdzvew3-5
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
renamed:
bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
doc/en/developer-guide/testing.txt => doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3638.3.18
revision-id: v.ladeuil+lp at free.fr-20080911105331-eoyl4qrfpu2v0pj4
parent: v.ladeuil+lp at free.fr-20080911085659-74uay5588sjdi88k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 12:53:31 +0200
message:
Fixed as per jam's review.
* bzrlib/tests/test_bundle.py:
(BundleTester.test_unicode_bundle): Use an unicode file name, but
not an ambiguous one.
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3638.3.17
revision-id: v.ladeuil+lp at free.fr-20080911085659-74uay5588sjdi88k
parent: v.ladeuil+lp at free.fr-20080908153126-rhjjxxng1czkh4vb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Thu 2008-09-11 10:56:59 +0200
message:
Fixed as per Aaron's review.
* bzrlib/tests/test_transform.py:
(TestTreeTransform.test_rollback_on_directory_clash.tt_helper):
Cleanup and grammar fixes.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3638.3.16
revision-id: v.ladeuil+lp at free.fr-20080908153126-rhjjxxng1czkh4vb
parent: v.ladeuil+lp at free.fr-20080908145015-mqsnsc8nnabngs7c
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 17:31:26 +0200
message:
Remove XFAIL from test_unicode_bundle.
* bzrlib/tests/test_bundle.py:
(BundleTester.test_unicode_bundle): Don't use unicode ambiguous
file names, that's the point of the test.
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3638.3.15
revision-id: v.ladeuil+lp at free.fr-20080908145015-mqsnsc8nnabngs7c
parent: v.ladeuil+lp at free.fr-20080908143528-hak1vrw8d64tb0zq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 16:50:15 +0200
message:
Fix test_case_insensitive_clash to pass on all platforms (renamed too).
* bzrlib/tests/test_transform.py:
(TestTreeTransform.test_rollback_on_directory_clash): Renamed from
test_case_insensitive_clash and changed to pass on all platforms.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3638.3.14
revision-id: v.ladeuil+lp at free.fr-20080908143528-hak1vrw8d64tb0zq
parent: v.ladeuil+lp at free.fr-20080908130427-l3hdk2z7i362l0iw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 16:35:28 +0200
message:
Make test_bad_fs_path not applicable on OSX.
* bzrlib/tests/workingtree_implementations/test_workingtree.py:
(TestIllegalPaths.test_bad_fs_path): You can't create an utf8
illegal filename on OSX.
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3638.3.13
revision-id: v.ladeuil+lp at free.fr-20080908130427-l3hdk2z7i362l0iw
parent: v.ladeuil+lp at free.fr-20080908125058-eq0ndfjyemfioxne
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 15:04:27 +0200
message:
Fix test_rename_to_denormalised_fails for OSX.
* bzrlib/tests/workingtree_implementations/test_rename_one.py:
(TestRenameOne.test_rename_to_denormalised_fails): Doesn't apply
to OSX which always normalize file names.
modified:
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
------------------------------------------------------------
revno: 3638.3.12
revision-id: v.ladeuil+lp at free.fr-20080908125058-eq0ndfjyemfioxne
parent: v.ladeuil+lp at free.fr-20080908115340-9e8ef038ryotedx7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 14:50:58 +0200
message:
Fix test missed in the previous commit (--starting-with doesn't
replace running the full test suite, copied 100 times).
* bzrlib/tests/tree_implementations/test_test_trees.py:
(TestTreeShapes.test_tree_with_utf8): Use non-combining
unicode chars to avoid normalization ambiguities.
modified:
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
------------------------------------------------------------
revno: 3638.3.11
revision-id: v.ladeuil+lp at free.fr-20080908115340-9e8ef038ryotedx7
parent: v.ladeuil+lp at free.fr-20080908075607-yqbmjnhhmzdjz61y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 13:53:40 +0200
message:
Fix failing tests by avoiding unicode combinig encodings (we test
utf-8 not the file system encoding here).
* bzrlib/tests/tree_implementations/test_test_trees.py:
(TestTreeShapes.test_tree_with_merged_utf8): Use non-combining
unicode chars to avoid normalization ambiguities.
* bzrlib/tests/tree_implementations/__init__.py:
(TestCaseWithTree._create_tree_with_utf8): Use non-combining
unicode chars to avoid normalization ambiguities.
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
------------------------------------------------------------
revno: 3638.3.10
revision-id: v.ladeuil+lp at free.fr-20080908075607-yqbmjnhhmzdjz61y
parent: v.ladeuil+lp at free.fr-20080908062742-mm7uf6zqjq45qhnt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 09:56:07 +0200
message:
Provides a better default encoding on OSX.
* bzrlib/osutils.py:
(get_user_encoding): Provides 'utf-8' as default on OSX instead of
'ascii' which even out own test suite doesn't like.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
------------------------------------------------------------
revno: 3638.3.9
revision-id: v.ladeuil+lp at free.fr-20080908062742-mm7uf6zqjq45qhnt
parent: v.ladeuil+lp at free.fr-20080901093445-gz2g0supj4kvscn2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-08 08:27:42 +0200
message:
Fix tar-related failing test (python-2.5.1 bug).
* bzrlib/tests/blackbox/test_export.py:
(TestExport.test_tar_export): OSX needs at least python-2.5.2 to
pass this test. Stock OSX is python-2.3 (not supported by bzr) and
there is no point in trying to support 2.4.
modified:
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 3638.3.8
revision-id: v.ladeuil+lp at free.fr-20080901093445-gz2g0supj4kvscn2
parent: v.ladeuil+lp at free.fr-20080901061607-dgqfeswfmaeouvjp
parent: pqm at pqm.ubuntu.com-20080901090124-w1cxlizdk4g3mstv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-01 11:34:45 +0200
message:
merge bzr.dev at 3671
added:
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
tools/packaging/ packaging-20080825202834-3j433iaawnt72wqa-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
renamed:
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
=== modified file 'NEWS'
--- a/NEWS 2008-09-10 19:13:43 +0000
+++ b/NEWS 2008-09-11 13:47:35 +0000
@@ -25,6 +25,9 @@
``bzrlib.tests.per_repository`` so that we have a common structure
(and it is shorter). (John Arbash Meinel, #239343)
+ * The full test suite is passing again on OSX.
+ (Guillermo Gonzalez, Vincent Ladeuil)
+
INTERNALS:
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2008-09-03 20:00:51 +0000
+++ b/bzrlib/osutils.py 2008-09-11 13:37:41 +0000
@@ -1425,9 +1425,19 @@
return _cached_user_encoding
if sys.platform == 'darwin':
- # work around egregious python 2.4 bug
+ # python locale.getpreferredencoding() always return
+ # 'mac-roman' on darwin. That's a lie.
sys.platform = 'posix'
try:
+ if os.environ.get('LANG', None) is None:
+ # If LANG is not set, we end up with 'ascii', which is bad
+ # ('mac-roman' is more than ascii), so we set a default which
+ # will give us UTF-8 (which appears to work in all cases on
+ # OSX). Users are still free to override LANG of course, as
+ # long as it give us something meaningful. This work-around
+ # *may* not be needed with python 3k and/or OSX 10.5, but will
+ # work with them too -- vila 20080908
+ os.environ['LANG'] = 'en_US.UTF-8'
import locale
finally:
sys.platform = 'darwin'
=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- a/bzrlib/tests/blackbox/test_export.py 2008-08-08 05:25:58 +0000
+++ b/bzrlib/tests/blackbox/test_export.py 2008-09-08 06:27:42 +0000
@@ -57,6 +57,9 @@
# '.bzrignore'.
self.assertEqual(['test/a'], sorted(ball.getnames()))
+ if sys.version_info < (2, 5, 2) and sys.platform == 'darwin':
+ raise tests.KnownFailure('python %r has a tar related bug, upgrade'
+ % sys.version_info)
out, err = self.run_bzr('export --format=tgz --root=test -')
ball = tarfile.open('', fileobj=StringIO(out))
self.assertEqual(['test/a'], sorted(ball.getnames()))
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2008-08-26 08:25:27 +0000
+++ b/bzrlib/tests/test_bundle.py 2008-09-11 10:53:31 +0000
@@ -38,8 +38,6 @@
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
from bzrlib.branch import Branch
from bzrlib.diff import internal_diff
-from bzrlib.errors import (BzrError, TestamentMismatch, NotABundle, BadBundle,
- NoSuchFile,)
from bzrlib.merge import Merge3Merger
from bzrlib.repofmt import knitrepo
from bzrlib.osutils import sha_file, sha_string
@@ -106,7 +104,7 @@
elif kind == 'symlink':
ie = InventoryLink(file_id, name, parent_id)
else:
- raise BzrError('unknown kind %r' % kind)
+ raise errors.BzrError('unknown kind %r' % kind)
ie.text_sha1 = text_sha_1
ie.text_size = text_size
return ie
@@ -435,16 +433,17 @@
return bundle
def test_non_bundle(self):
- self.assertRaises(NotABundle, read_bundle, StringIO('#!/bin/sh\n'))
+ self.assertRaises(errors.NotABundle,
+ read_bundle, StringIO('#!/bin/sh\n'))
def test_malformed(self):
- self.assertRaises(BadBundle, read_bundle,
+ self.assertRaises(errors.BadBundle, read_bundle,
StringIO('# Bazaar revision bundle v'))
def test_crlf_bundle(self):
try:
read_bundle(StringIO('# Bazaar revision bundle v0.8\r\n'))
- except BadBundle:
+ except errors.BadBundle:
# It is currently permitted for bundles with crlf line endings to
# make read_bundle raise a BadBundle, but this should be fixed.
# Anything else, especially NotABundle, is an error.
@@ -482,7 +481,7 @@
for inventory_id in old:
try:
old_file = old.get_file(inventory_id)
- except NoSuchFile:
+ except errors.NoSuchFile:
continue
if old_file is None:
continue
@@ -618,7 +617,7 @@
self.tree1.commit('removed', rev_id='a at cset-0-3')
bundle = self.get_valid_bundle('a at cset-0-2', 'a at cset-0-3')
- self.assertRaises((TestamentMismatch,
+ self.assertRaises((errors.TestamentMismatch,
errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
'a at cset-0-2', 'a at cset-0-3')
# Check a rollup bundle
@@ -796,7 +795,7 @@
# Handle international characters
os.mkdir('b1')
try:
- f = open(u'b1/with Dod\xe9', 'wb')
+ f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
except UnicodeEncodeError:
raise TestSkipped("Filesystem doesn't support unicode")
@@ -808,44 +807,30 @@
u'William Dod\xe9\n').encode('utf-8'))
f.close()
- self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
+ self.tree1.add([u'with Dod\N{Euro Sign}'], ['withdod-id'])
self.tree1.commit(u'i18n commit from William Dod\xe9',
rev_id='i18n-1', committer=u'William Dod\xe9')
- if sys.platform == 'darwin':
- from bzrlib.workingtree import WorkingTree3
- if type(self.tree1) is WorkingTree3:
- self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
-
- # On Mac the '\xe9' gets changed to 'e\u0301'
- self.assertEqual([u'.bzr', u'with Dode\u0301'],
- sorted(os.listdir(u'b1')))
- delta = self.tree1.changes_from(self.tree1.basis_tree())
- self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
- delta.removed)
- self.knownFailure("Mac OSX doesn't preserve unicode"
- " combining characters.")
-
# Add
bundle = self.get_valid_bundle('null:', 'i18n-1')
# Modified
- f = open(u'b1/with Dod\xe9', 'wb')
+ f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
f.write(u'Modified \xb5\n'.encode('utf8'))
f.close()
self.tree1.commit(u'modified', rev_id='i18n-2')
bundle = self.get_valid_bundle('i18n-1', 'i18n-2')
-
+
# Renamed
- self.tree1.rename_one(u'with Dod\xe9', u'B\xe5gfors')
+ self.tree1.rename_one(u'with Dod\N{Euro Sign}', u'B\N{Euro Sign}gfors')
self.tree1.commit(u'renamed, the new i18n man', rev_id='i18n-3',
committer=u'Erik B\xe5gfors')
bundle = self.get_valid_bundle('i18n-2', 'i18n-3')
# Removed
- self.tree1.remove([u'B\xe5gfors'])
+ self.tree1.remove([u'B\N{Euro Sign}gfors'])
self.tree1.commit(u'removed', rev_id='i18n-4')
bundle = self.get_valid_bundle('i18n-3', 'i18n-4')
@@ -1583,7 +1568,7 @@
record = record_iter.next()
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
'info', None, None), record)
- self.assertRaises(BadBundle, record_iter.next)
+ self.assertRaises(errors.BadBundle, record_iter.next)
class TestReadMergeableFromUrl(TestCaseWithTransport):
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2008-08-29 00:35:38 +0000
+++ b/bzrlib/tests/test_transform.py 2008-09-11 08:56:59 +0000
@@ -1162,22 +1162,27 @@
transform.cancel_creation(parent)
transform.finalize()
- def test_case_insensitive_clash(self):
- self.requireFeature(CaseInsensitiveFilesystemFeature)
+ def test_rollback_on_directory_clash(self):
def tt_helper():
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
- tt.new_file('foo', tt.root, 'bar')
- tt.new_file('Foo', tt.root, 'spam')
+ foo = tt.new_directory('foo', tt.root)
+ tt.new_file('bar', foo, 'foobar')
+ baz = tt.new_directory('baz', tt.root)
+ tt.new_file('qux', baz, 'quux')
+ # Ask for a rename 'foo' -> 'baz'
+ tt.adjust_path('baz', tt.root, foo)
# Lie to tt that we've already resolved all conflicts.
tt.apply(no_conflicts=True)
except:
wt.unlock()
raise
+ # The rename will fail because the target directory is not empty (but
+ # raises FileExists anyway).
err = self.assertRaises(errors.FileExists, tt_helper)
self.assertContainsRe(str(err),
- "^File exists: .+/foo")
+ "^File exists: .+/baz")
def test_two_directories_clash(self):
def tt_helper():
@@ -1186,6 +1191,7 @@
try:
foo_1 = tt.new_directory('foo', tt.root)
tt.new_directory('bar', foo_1)
+ # Adding the same directory with a different content
foo_2 = tt.new_directory('foo', tt.root)
tt.new_directory('baz', foo_2)
# Lie to tt that we've already resolved all conflicts.
@@ -1204,6 +1210,7 @@
try:
foo_1 = tt.new_directory('foo', tt.root)
tt.new_directory('bar', foo_1)
+ # Adding the same directory with a different content
foo_2 = tt.new_directory('foo', tt.root)
tt.new_directory('baz', foo_2)
# Lie to tt that we've already resolved all conflicts.
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py 2008-08-28 23:43:12 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py 2008-09-08 11:53:40 +0000
@@ -272,17 +272,21 @@
def _create_tree_with_utf8(self, tree):
"""Generate a tree with a utf8 revision and unicode paths."""
+ # We avoid combining characters in file names here, normalization
+ # checks (as performed by some file systems (OSX) are outside the scope
+ # of these tests). We use the euro sign \N{Euro Sign} or \u20ac in
+ # unicode strings or '\xe2\x82\ac' (its utf-8 encoding) in raw strings.
paths = [u'',
- u'f\xf6',
- u'b\xe5r/',
- u'b\xe5r/b\xe1z',
+ u'fo\N{Euro Sign}o',
+ u'ba\N{Euro Sign}r/',
+ u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
]
# bzr itself does not create unicode file ids, but we want them for
# testing.
file_ids = ['TREE_ROOT',
- 'f\xc3\xb6-id',
- 'b\xc3\xa5r-id',
- 'b\xc3\xa1z-id',
+ 'fo\xe2\x82\xaco-id',
+ 'ba\xe2\x82\xacr-id',
+ 'ba\xe2\x82\xacz-id',
]
try:
self.build_tree(paths[1:])
@@ -304,8 +308,9 @@
"""Generate a tree with utf8 ancestors."""
self._create_tree_with_utf8(tree)
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
- self.build_tree([u'tree2/b\xe5r/z\xf7z'])
- tree2.add([u'b\xe5r/z\xf7z'], [u'z\xf7z-id'.encode('utf-8')])
+ self.build_tree([u'tree2/ba\N{Euro Sign}r/qu\N{Euro Sign}x'])
+ tree2.add([u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'],
+ [u'qu\N{Euro Sign}x-id'.encode('utf-8')])
tree2.commit(u'to m\xe9rge', rev_id=u'r\xe9v-2'.encode('utf8'))
tree.merge_from_branch(tree2.branch)
=== modified file 'bzrlib/tests/tree_implementations/test_test_trees.py'
--- a/bzrlib/tests/tree_implementations/test_test_trees.py 2008-04-12 19:43:13 +0000
+++ b/bzrlib/tests/tree_implementations/test_test_trees.py 2008-09-08 12:50:58 +0000
@@ -216,13 +216,14 @@
revision_id = u'r\xe9v-1'.encode('utf8')
root_id = 'TREE_ROOT'
- bar_id = u'b\xe5r-id'.encode('utf8')
- foo_id = u'f\xf6-id'.encode('utf8')
- baz_id = u'b\xe1z-id'.encode('utf8')
- path_and_ids = [(u'', root_id, None),
- (u'b\xe5r', bar_id, root_id),
- (u'f\xf6', foo_id, root_id),
- (u'b\xe5r/b\xe1z', baz_id, bar_id),
+ bar_id = u'ba\N{Euro Sign}r-id'.encode('utf8')
+ foo_id = u'fo\N{Euro Sign}o-id'.encode('utf8')
+ baz_id = u'ba\N{Euro Sign}z-id'.encode('utf8')
+ path_and_ids = [(u'', root_id, None, None),
+ (u'ba\N{Euro Sign}r', bar_id, root_id, revision_id),
+ (u'fo\N{Euro Sign}o', foo_id, root_id, revision_id),
+ (u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
+ baz_id, bar_id, revision_id),
]
tree.lock_read()
try:
@@ -260,15 +261,17 @@
revision_id_1 = u'r\xe9v-1'.encode('utf8')
revision_id_2 = u'r\xe9v-2'.encode('utf8')
root_id = 'TREE_ROOT'
- bar_id = u'b\xe5r-id'.encode('utf8')
- foo_id = u'f\xf6-id'.encode('utf8')
- baz_id = u'b\xe1z-id'.encode('utf8')
- zez_id = u'z\xf7z-id'.encode('utf8')
+ bar_id = u'ba\N{Euro Sign}r-id'.encode('utf8')
+ foo_id = u'fo\N{Euro Sign}o-id'.encode('utf8')
+ baz_id = u'ba\N{Euro Sign}z-id'.encode('utf8')
+ qux_id = u'qu\N{Euro Sign}x-id'.encode('utf8')
path_and_ids = [(u'', root_id, None, None),
- (u'b\xe5r', bar_id, root_id, revision_id_1),
- (u'f\xf6', foo_id, root_id, revision_id_1),
- (u'b\xe5r/b\xe1z', baz_id, bar_id, revision_id_1),
- (u'b\xe5r/z\xf7z', zez_id, bar_id, revision_id_2),
+ (u'ba\N{Euro Sign}r', bar_id, root_id, revision_id_1),
+ (u'fo\N{Euro Sign}o', foo_id, root_id, revision_id_1),
+ (u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',
+ baz_id, bar_id, revision_id_1),
+ (u'ba\N{Euro Sign}r/qu\N{Euro Sign}x',
+ qux_id, bar_id, revision_id_2),
]
tree.lock_read()
try:
@@ -276,22 +279,23 @@
finally:
tree.unlock()
- for expected, (path, ie) in zip(path_and_ids, path_entries):
- self.assertEqual(expected[0], path) # Paths should match
+ for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,
+ path_entries):
+ self.assertEqual(epath, path) # Paths should match
self.assertIsInstance(path, unicode)
- self.assertEqual(expected[1], ie.file_id)
+ self.assertEqual(efid, ie.file_id)
self.assertIsInstance(ie.file_id, str)
- self.assertEqual(expected[2], ie.parent_id)
- if expected[2] is not None:
+ self.assertEqual(eparent, ie.parent_id)
+ if eparent is not None:
self.assertIsInstance(ie.parent_id, str)
# WorkingTree's return None for the last modified revision
if ie.revision is not None:
self.assertIsInstance(ie.revision, str)
- if expected[0] == '':
+ if epath == '':
# Some trees will preserve the revision id of the tree root,
# but not all will
continue
- self.assertEqual(expected[3], ie.revision)
+ self.assertEqual(erev, ie.revision)
self.assertEqual(len(path_and_ids), len(path_entries))
get_revision_id = getattr(tree, 'get_revision_id', None)
if get_revision_id is not None:
=== modified file 'bzrlib/tests/workingtree_implementations/test_rename_one.py'
--- a/bzrlib/tests/workingtree_implementations/test_rename_one.py 2008-01-28 22:41:25 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_rename_one.py 2008-09-08 13:04:27 +0000
@@ -21,6 +21,7 @@
from bzrlib import (
errors,
osutils,
+ tests,
)
from bzrlib.workingtree_4 import WorkingTreeFormat4
@@ -310,6 +311,8 @@
('a/b', 'b-id')], tree.basis_tree())
def test_rename_to_denormalised_fails(self):
+ if osutils.normalizes_filenames():
+ raise tests.TestNotApplicable('OSX normalizes filenames')
tree = self.make_branch_and_tree('.')
self.build_tree(['a'])
tree.add(['a'])
=== modified file 'bzrlib/tests/workingtree_implementations/test_workingtree.py'
--- a/bzrlib/tests/workingtree_implementations/test_workingtree.py 2008-08-15 00:54:23 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_workingtree.py 2008-09-11 13:37:41 +0000
@@ -920,6 +920,9 @@
class TestIllegalPaths(TestCaseWithWorkingTree):
def test_bad_fs_path(self):
+ if osutils.normalizes_filenames():
+ # You *can't* create an illegal filename on OSX.
+ raise tests.TestNotApplicable('OSX normalizes filenames')
self.requireFeature(tests.UTF8Filesystem)
# We require a UTF8 filesystem, because otherwise we would need to get
# tricky to figure out how to create an illegal filename.
More information about the bazaar-commits
mailing list