Rev 1945: (andrew) Improvements to test_bzr to work with the facilities offered by the smart server. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Aug 18 11:49:08 BST 2006


------------------------------------------------------------
revno: 1945
revision-id: pqm at pqm.ubuntu.com-20060818104907-d9d6f22c28578d93
parent: pqm at pqm.ubuntu.com-20060818001219-f32cfe5183ffe012
parent: robertc at robertcollins.net-20060818102855-b43010989c0cf801
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-08-18 11:49:07 +0100
message:
  (andrew) Improvements to test_bzr to work with the facilities offered by the smart server.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060818102855-b43010989c0cf801
    parent: andrew.bennetts at canonical.com-20060818072230-8c49d4cf2388bc3e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-08-18 20:28:55 +1000
    message:
      Fix a minor bug in BzrDirPreSplitOut.sprout - it did not define the force_new_repo parameter - and we were not testing that it did or didn't until the test cleanup.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818072230-8c49d4cf2388bc3e
    parent: andrew.bennetts at canonical.com-20060818052317-d11b25d4d94dcd82
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-18 17:22:30 +1000
    message:
      Add a sproutOrSkip test helper.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818052317-d11b25d4d94dcd82
    parent: andrew.bennetts at canonical.com-20060818051120-9ad5e4654b9c8c02
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-18 15:23:17 +1000
    message:
      Slightly more consistent names.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818051120-9ad5e4654b9c8c02
    parent: andrew.bennetts at canonical.com-20060818043915-de87b0f0a11516b1
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-18 15:11:20 +1000
    message:
      Use camelCase for test helpers to be more consistent unittest naming.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060818043915-de87b0f0a11516b1
    parent: andrew.bennetts at canonical.com-20060816074938-4316cc4941cb7f99
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-18 14:39:15 +1000
    message:
      Add 'create_workingtree_or_skip' and 'skip_if_no_workingtree' helper methods to reduce duplicated code.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816074938-4316cc4941cb7f99
    parent: andrew.bennetts at canonical.com-20060816060723-2e43f4250f4ada39
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Wed 2006-08-16 17:49:38 +1000
    message:
      Skip various test_sprout* tests when sprouting to non-local bzrdirs that can't have working trees; plus fix a test method naming clash and the bug it revealed in bzrdir.sprout.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816060723-2e43f4250f4ada39
    parent: andrew.bennetts at canonical.com-20060816043642-3a72c47857450158
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Wed 2006-08-16 16:07:23 +1000
    message:
      Skip test_upgrade_new_instance if we don't have a local transport, and cosmetic tweaks.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060816043642-3a72c47857450158
    parent: andrew.bennetts at canonical.com-20060811065942-f099d839ce2f8738
    parent: andrew.bennetts at canonical.com-20060816043611-7818a1909ab84498
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Wed 2006-08-16 14:36:42 +1000
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060811065942-f099d839ce2f8738
    parent: andrew.bennetts at canonical.com-20060811060934-50e84de9ea6867ab
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-11 16:59:42 +1000
    message:
      Make test_sprout_bzrdir_tree_* skip when transports don't support working trees.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060811060934-50e84de9ea6867ab
    parent: andrew.bennetts at canonical.com-20060810135005-edc3b07fabff1efc
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Fri 2006-08-11 16:09:34 +1000
    message:
      Make test_clone_bzrdir_tree_* skip when transports don't support working trees.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060810135005-edc3b07fabff1efc
    parent: andrew.bennetts at canonical.com-20060810134844-72064160094b5c78
    parent: andrew.bennetts at canonical.com-20060810134954-5b6cf369cad0e320
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Thu 2006-08-10 23:50:05 +1000
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060810134844-72064160094b5c78
    parent: andrew.bennetts at canonical.com-20060809053314-656cdc405ebbf36e
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Thu 2006-08-10 23:48:44 +1000
    message:
      skip test_revert_inventory if the transport doesn't allow workinig trees to be created.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060809053314-656cdc405ebbf36e
    parent: andrew.bennetts at canonical.com-20060808045418-aa1b64d384cff417
    parent: andrew.bennetts at canonical.com-20060809053258-f965d90f0284bed5
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Wed 2006-08-09 15:33:14 +1000
    message:
      Merge from trivial
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060808045418-aa1b64d384cff417
    parent: andrew.bennetts at canonical.com-20060808044415-c45ae6190e1acc50
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Tue 2006-08-08 14:54:18 +1000
    message:
      Clearer comment and more precise test for directory existence in test_get_*_transport.
    ------------------------------------------------------------
    merged: andrew.bennetts at canonical.com-20060808044415-c45ae6190e1acc50
    parent: andrew.bennetts at canonical.com-20060808023124-acc195a4317a5217
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: test-tweaks
    timestamp: Tue 2006-08-08 14:44:15 +1000
    message:
      Clearer comment and more precise test for directory existence in test_get_branch_transport.



More information about the bazaar-commits mailing list