/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/bench_bench.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_bench.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for bzr benchmark utilities performance."""
18
18
 
29
29
 
30
30
 
31
31
class MakeKernelLikeTreeBenchmark(Benchmark):
32
 
    """Benchmark creating benchmark trees."""
33
32
 
34
33
    def test_make_kernel_like_tree(self):
35
 
        """Making a kernel sized tree should be ~ 5seconds on modern disk."""
 
34
        """Making a kernel sized tree should be ~ 5seconds on modern disk.""" 
36
35
        # on roberts machine: this originally took:  7372ms/ 7479ms
37
36
        # with the LocalTransport._abspath call:     3730ms/ 3778ms
38
37
        # with AtomicFile tuning:                    2888ms/ 2926ms
55
54
        self.time(creator.create, root='foo')
56
55
 
57
56
    def test_04_make_kernel_like_added_tree(self):
58
 
        """Time the second creation of a kernel like added tree
 
57
        """Time the second creation of a kernel like added tree 
59
58
        (this should be a clone)
60
59
        """
61
60
        # make sure kernel_like_added_tree is cached
73
72
        self.time(creator.create, root='foo')
74
73
 
75
74
    def test_06_make_kernel_like_committed_tree(self):
76
 
        """Time the second creation of a committed kernel like tree
 
75
        """Time the second creation of a committed kernel like tree 
77
76
        (this should be a clone)
78
77
        """
79
78
        creator = KernelLikeCommittedTreeCreator(self,
86
85
        self.time(creator.create, root='bar')
87
86
 
88
87
    def test_07_make_kernel_like_committed_tree_hardlink(self):
89
 
        """Time the creation of a committed kernel like tree
 
88
        """Time the creation of a committed kernel like tree 
90
89
        (this should also hardlink the .bzr/ directory)
91
90
        """
92
91
        creator = KernelLikeCommittedTreeCreator(self,