Rev 1263: [merge] robertc via bzr.dev in /home/mbp/work/bzr/bzr.mbp.storage

Martin Pool mbp at sourcefrog.net
Thu Jan 12 08:49:03 GMT 2006


------------------------------------------------------------
revno: 1263
revision-id: mbp at sourcefrog.net-20060112084859-62f2a2c71e50d442
parent: mbp at sourcefrog.net-20060112083710-642730d8ae44f906
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 19:48:59 +1100
message:
  [merge] robertc via bzr.dev
added:
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/stub_sftp.py      stub_sftp.py-20051027032739-0e7ef4f7bab0e174
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_parent.py    test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  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_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
    parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
    parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-12 17:37:23 +1100
    message:
      [merge] robertc-integration
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060112024225-fe991391e088dd58
    parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
    parent: robertc at robertcollins.net-20060112010232-32d7a5b35bbc94df
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-01-12 13:42:25 +1100
    message:
       * Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
         paths for the transport tests. Introduce blackbox remote sftp tests that
         test the same permutations. (Robert Collins, Robey Pointer)
      
       * Transport implementation tests are now independent of the local file
         system, which allows tests for esoteric transports, and for features
         not available in the local file system. They also repeat for variations
         on the URL scheme that can introduce issues in the transport code,
         see bzrlib.transport.TransportTestProviderAdapter() for this.
         (Robert Collins).
      
       * TestCase.build_tree uses the transport interface to build trees, pass
         in a transport parameter to give it an existing connection.
         (Robert Collins).
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060112010232-32d7a5b35bbc94df
    parent: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Thu 2006-01-12 12:02:32 +1100
    message:
      Review feedback fixes.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
    parent: robertc at robertcollins.net-20060110060118-10b2b8f44f670252
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 17:27:04 +1100
    message:
      BRANCH.TODO is done.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110060118-10b2b8f44f670252
    parent: robertc at robertcollins.net-20060110055028-b5b60fddbf24606c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 17:01:18 +1100
    message:
      Make transport test adapter tests reliable.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110055028-b5b60fddbf24606c
    parent: robertc at robertcollins.net-20060110054516-c93c279bbae5d69f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 16:50:28 +1100
    message:
      unbreak test_fetch
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110054516-c93c279bbae5d69f
    parent: robertc at robertcollins.net-20060110052543-5e4481bee9df7f24
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 16:45:16 +1100
    message:
      Move check_mode to TestCase.assertMode to make it generally accessible.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110052543-5e4481bee9df7f24
    parent: robertc at robertcollins.net-20060110045628-23a25c175e0c1925
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 16:25:43 +1100
    message:
      Move mkdir and copy_to permissions tests to test_transport_impleentation.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110045628-23a25c175e0c1925
    parent: robertc at robertcollins.net-20060110043922-cd7ddc4554ad2df1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 15:56:28 +1100
    message:
      Move put mode tests into test_transport_implementation.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110043922-cd7ddc4554ad2df1
    parent: robertc at robertcollins.net-20060110040907-0bec8d261e79217b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 15:39:22 +1100
    message:
      Remove duplicate web server from HTTPTestUtil.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110040907-0bec8d261e79217b
    parent: robertc at robertcollins.net-20060110040839-f5db7e1fba6a752a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 15:09:07 +1100
    message:
      Update BRANCH.TODO
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110040839-f5db7e1fba6a752a
    parent: robertc at robertcollins.net-20060110011019-c60a1ae0fef4dc93
    parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 15:08:39 +1100
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060109051935-ee3847274413fe22
    parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2006-01-09 16:19:35 +1100
    message:
      merge from Martin.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060110011019-c60a1ae0fef4dc93
    parent: robertc at robertcollins.net-20060103030420-43db89e56ea7e350
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-10 12:10:19 +1100
    message:
      Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060103030420-43db89e56ea7e350
    parent: robertc at robertcollins.net-20060103030007-879f80dd6dc82a00
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-03 14:04:20 +1100
    message:
      Trim legacy transport tests back to mode, which cannot be tested across the board usefully.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060103030007-879f80dd6dc82a00
    parent: robertc at robertcollins.net-20060103024317-7e36a5a01d2f8069
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-03 14:00:07 +1100
    message:
      Test bogus urls with http in the new infrastructure.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060103024317-7e36a5a01d2f8069
    parent: robertc at robertcollins.net-20060103020706-998bb02793088bdf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-03 13:43:17 +1100
    message:
      More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060103020706-998bb02793088bdf
    parent: robertc at robertcollins.net-20051228221949-e9b25a75ac80edd3
    parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2006-01-03 13:07:06 +1100
    message:
      merge integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051228221949-e9b25a75ac80edd3
    parent: robertc at robertcollins.net-20051227230143-a76349838155a778
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Thu 2005-12-29 09:19:49 +1100
    message:
      Trim duplicate sftp tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051227230143-a76349838155a778
    parent: robertc at robertcollins.net-20051227225212-f3cfb3ece3c17998
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Wed 2005-12-28 10:01:43 +1100
    message:
      Reinstate Memory parameter tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051227225212-f3cfb3ece3c17998
    parent: robertc at robertcollins.net-20051227111517-51d0fe370eaa9ac8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Wed 2005-12-28 09:52:12 +1100
    message:
      integrate Memory tests into transport interface tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051227111517-51d0fe370eaa9ac8
    parent: robertc at robertcollins.net-20051226023129-d88c695d1bb7c5cc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Tue 2005-12-27 22:15:17 +1100
    message:
      transport implementations now tested consistently.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051226023129-d88c695d1bb7c5cc
    parent: robertc at robertcollins.net-20051224062537-186c50cb3a4509b3
    parent: robertc at robertcollins.net-20051209023648-84dd2e94fc376358
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Mon 2005-12-26 13:31:29 +1100
    message:
      Merge in sftp-rfc-tests branch.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051209023648-84dd2e94fc376358
    parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: sftp_rfc_tests
    timestamp: Fri 2005-12-09 13:36:48 +1100
    message:
      Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
      paths for the transport tests. Introduce blackbox remote sftp tests that
      test the same permutations. (Robert Collins, Robey Pointer)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051224062537-186c50cb3a4509b3
    parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: test-providers
    timestamp: Sat 2005-12-24 17:25:37 +1100
    message:
      Minimal infrastructure to test TransportTestProviderAdapter.



More information about the bazaar-commits mailing list