Rev 4298: (trivial) More cleanup test imports and use features to better track skipped tests in http://bazaar.launchpad.net/%7Evila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/integration

------------------------------------------------------------
revno: 4298 [merge]
revision-id: v.ladeuil+lp at free.fr-20090417141358-vk5tcfa55qembpv2
parent: pqm at pqm.ubuntu.com-20090417084143-8ias85nrnap1hk9z
parent: v.ladeuil+lp at free.fr-20090417140332-ey5zutiy0ygxnml0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Fri 2009-04-17 16:13:58 +0200
message:
  (trivial) More cleanup test imports and use features to better track skipped tests
modified:
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
------------------------------------------------------------
Use --levels 0 (or -n0) to see merged revisions.
-------------- next part --------------

Diff too large for email (1106 lines, the limit is 1000).