Rev 3319: (vila) Trivial test suite fixes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Mar 31 11:56:42 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3319
revision-id:pqm at pqm.ubuntu.com-20080331105632-qxz6ssqxpb7sb0hv
parent: pqm at pqm.ubuntu.com-20080331091745-r831hmhda7j4nm54
parent: v.ladeuil+lp at free.fr-20080331071645-hhly8l5lhub9swse
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-03-31 11:56:32 +0100
message:
(vila) Trivial test suite fixes
modified:
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3317.2.1
revision-id:v.ladeuil+lp at free.fr-20080331071645-hhly8l5lhub9swse
parent: pqm at pqm.ubuntu.com-20080331043759-0a8hhft91h108mh7
parent: v.ladeuil+lp at free.fr-20080330201640-cqg11m8ay5bn095n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2008-03-31 09:16:45 +0200
message:
Trivial test suite fixes
modified:
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.5.7
revision-id:v.ladeuil+lp at free.fr-20080330201640-cqg11m8ay5bn095n
parent: v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Sun 2008-03-30 22:16:40 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3302.5.6
revision-id:v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
parent: v.ladeuil+lp at free.fr-20080324191209-23lppe6oqc0ef4kh
parent: v.ladeuil+lp at free.fr-20080326214255-02rhczp1uixzhvsm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Wed 2008-03-26 22:43:31 +0100
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 3302.5.5
revision-id:v.ladeuil+lp at free.fr-20080324191209-23lppe6oqc0ef4kh
parent: v.ladeuil+lp at free.fr-20080324154444-38ox0sd3t1er995r
parent: v.ladeuil+lp at free.fr-20080324191104-uq1uc3tscb1det4x
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Mon 2008-03-24 20:12:09 +0100
message:
Help identify duplicates IDs in test suite
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.5.4
revision-id:v.ladeuil+lp at free.fr-20080324154444-38ox0sd3t1er995r
parent: v.ladeuil+lp at free.fr-20080324144052-x611h8wtkr8fbla8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Mon 2008-03-24 16:44:44 +0100
message:
Make interreop parametrized tests IDs unique.
* bzrlib/tests/test_selftest.py:
(TestInterRepositoryProviderAdapter.test_adapted_tests): Update
with the new IDs.
* bzrlib/tests/interrepository_implementations/__init__.py:
(InterRepositoryTestProviderAdapter.formats_to_scenarios):
Provides unique ids for tests to help defect localization.
modified:
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3302.5.3
revision-id:v.ladeuil+lp at free.fr-20080324144052-x611h8wtkr8fbla8
parent: v.ladeuil+lp at free.fr-20080324143902-nim8ieiiyxig36lh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Mon 2008-03-24 15:40:52 +0100
message:
Fix another test bug revealed when run alone.
* bzrlib/tests/interrepository_implementations/test_interrepository.py:
Add missing bzrlib.gpg import.
modified:
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3302.5.2
revision-id:v.ladeuil+lp at free.fr-20080324143902-nim8ieiiyxig36lh
parent: v.ladeuil+lp at free.fr-20080324143546-l68ctb0pa3ewgroa
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Mon 2008-03-24 15:39:02 +0100
message:
Fix test bug revealed when run alone.
* bzrlib/tests/test_lazy_import.py:
(TestScopeReplacer.test_setattr_replaces): Don't rely on other
tests calling TestClass.use_actions
modified:
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
------------------------------------------------------------
revno: 3302.5.1
revision-id:v.ladeuil+lp at free.fr-20080324143546-l68ctb0pa3ewgroa
parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Mon 2008-03-24 15:35:46 +0100
message:
Give better IDs to doctests.
* bzrlib/doc/api/__init__.py:
(load_tests.make_new_test_id): Add '.DocFileTest' in the test id
or selftest --load-list get confused and fails to properly
recognize the module name.
modified:
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
=== modified file 'bzrlib/doc/api/__init__.py'
--- a/bzrlib/doc/api/__init__.py 2008-01-21 14:49:18 +0000
+++ b/bzrlib/doc/api/__init__.py 2008-03-24 14:35:46 +0000
@@ -42,7 +42,7 @@
# want the module to appears there.
for t in tests.iter_suite_tests(suite):
def make_new_test_id():
- new_id = '%s(%s)' % ( __name__, t)
+ new_id = '%s.DocFileTest(%s)' % ( __name__, t)
return lambda: new_id
t.id = make_new_test_id()
return suite
=== modified file 'bzrlib/tests/interrepository_implementations/__init__.py'
--- a/bzrlib/tests/interrepository_implementations/__init__.py 2007-11-29 22:27:29 +0000
+++ b/bzrlib/tests/interrepository_implementations/__init__.py 2008-03-24 15:44:44 +0000
@@ -63,7 +63,10 @@
"""
result = []
for interrepo_class, repository_format, repository_format_to in formats:
- scenario = (interrepo_class.__name__,
+ id = '%s,%s,%s' % (interrepo_class.__name__,
+ repository_format.__class__.__name__,
+ repository_format_to.__class__.__name__)
+ scenario = (id,
{"transport_server":self._transport_server,
"transport_readonly_server":self._transport_readonly_server,
"repository_format":repository_format,
=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- a/bzrlib/tests/interrepository_implementations/test_interrepository.py 2008-01-17 03:14:20 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_interrepository.py 2008-03-24 14:40:52 +0000
@@ -28,6 +28,7 @@
UninitializableFormat,
NotBranchError,
)
+import bzrlib.gpg
from bzrlib.inventory import Inventory
import bzrlib.repofmt.weaverepo as weaverepo
import bzrlib.repository as repository
=== modified file 'bzrlib/tests/test_lazy_import.py'
--- a/bzrlib/tests/test_lazy_import.py 2007-11-09 02:24:44 +0000
+++ b/bzrlib/tests/test_lazy_import.py 2008-03-24 14:39:02 +0000
@@ -156,6 +156,8 @@
An object should appear in globals() by constructing a ScopeReplacer,
and it will be replaced with the real object upon the first request.
"""
+ actions = []
+ TestClass.use_actions(actions)
def factory(replacer, scope, name):
return TestClass()
try:
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2008-03-26 21:42:55 +0000
+++ b/bzrlib/tests/test_selftest.py 2008-03-26 21:43:31 +0000
@@ -376,13 +376,13 @@
formats = [(str, "C1", "C2"), (int, "D1", "D2")]
adapter = InterRepositoryTestProviderAdapter(server1, server2, formats)
self.assertEqual([
- ('str',
+ ('str,str,str',
{'interrepo_class': str,
'repository_format': 'C1',
'repository_format_to': 'C2',
'transport_readonly_server': 'b',
'transport_server': 'a'}),
- ('int',
+ ('int,str,str',
{'interrepo_class': int,
'repository_format': 'D1',
'repository_format_to': 'D2',
More information about the bazaar-commits
mailing list