/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_commit.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_commit.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
"""Benchmarks of bzr commit."""
18
18
 
24
24
 
25
25
 
26
26
class CommitBenchmark(Benchmark):
27
 
    """Benchmarks for ``bzr commit``"""
28
27
 
29
28
    def test_commit_kernel_like_tree(self):
30
29
        """Commit of a fresh import of a clean kernel sized tree."""
33
32
        # self.transport_server = MemoryServer
34
33
        # self.make_kernel_like_tree(self.get_url())
35
34
        tree = self.make_kernel_like_added_tree()
36
 
        self.time(self.run_bzr, ['commit', '-m', 'first post'])
 
35
        self.time(self.run_bzr, 'commit', '-m', 'first post')
37
36
 
38
37
    def test_partial_commit_kernel_like_tree(self):
39
38
        """Commit of 1/8th of a fresh import of a clean kernel sized tree."""
40
39
        tree = self.make_kernel_like_added_tree()
41
 
        self.time(self.run_bzr, ['commit', '-m', 'first post', '1'])
 
40
        self.time(self.run_bzr, 'commit', '-m', 'first post', '1')
42
41
 
43
42
    def test_no_op_commit_in_kernel_like_tree(self):
44
43
        """Run commit --unchanged in a kernel sized tree"""
45
44
        tree = self.make_kernel_like_committed_tree()
46
 
        self.time(self.run_bzr, ['commit', '-m', 'no changes', '--unchanged'])
 
45
        self.time(self.run_bzr, 'commit', '-m', 'no changes', '--unchanged')
47
46
 
48
47
    def test_commit_one_in_kernel_like_tree(self):
49
48
        """Time committing a single change, when not directly specified"""
52
51
        # working-tree is hardlinked, so replace a file and commit the change
53
52
        os.remove('4/4/4/4')
54
53
        open('4/4/4/4', 'wb').write('new contents\n')
55
 
        self.time(self.run_bzr, ['commit', '-m', 'second'])
 
54
        self.time(self.run_bzr, 'commit', '-m', 'second')
56
55
 
57
56
    def test_partial_commit_one_in_kernel_like_tree(self):
58
57
        """Time committing a single change when it is directly specified"""
61
60
        # working-tree is hardlinked, so replace a file and commit the change
62
61
        os.remove('4/4/4/4')
63
62
        open('4/4/4/4', 'wb').write('new contents\n')
64
 
        self.time(self.run_bzr, ['commit', '-m', 'second', '4/4/4/4'])
 
63
        self.time(self.run_bzr, 'commit', '-m', 'second', '4/4/4/4')
65
64
 
66
65
    def make_simple_tree(self):
67
66
        """A small, simple tree. No caching needed"""
73
72
    def test_cmd_commit(self):
74
73
        """Test execution of simple commit"""
75
74
        tree = self.make_simple_tree()
76
 
        self.time(self.run_bzr, ['commit', '-m', 'init simple tree'])
 
75
        self.time(self.run_bzr, 'commit', '-m', 'init simple tree')
77
76
 
78
77
    def test_cmd_commit_subprocess(self):
79
 
        """Text startup and execution of a simple commit."""
 
78
        """Text startup and execution of a simple commit.""" 
80
79
        tree = self.make_simple_tree()
81
80
        self.time(self.run_bzr_subprocess, 'commit', '-m', 'init simple tree')