/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_bundle.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_bundle.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 bundle performance."""
18
18
 
21
21
import shutil
22
22
 
23
23
from bzrlib import bzrdir
 
24
from bzrlib.add import smart_add
24
25
from bzrlib.benchmarks import Benchmark
25
26
from bzrlib.branch import Branch
26
27
from bzrlib.bundle.apply_bundle import install_bundle
32
33
 
33
34
class BundleBenchmark(Benchmark):
34
35
    """Benchmarks for bzr bundle performance and bzr merge with a bundle."""
35
 
 
 
36
   
36
37
    def test_create_bundle_known_kernel_like_tree(self):
37
38
        """Create a bundle for a kernel sized tree with no ignored, unknowns,
38
39
        or added and one commit.
39
 
        """
 
40
        """ 
40
41
        self.make_kernel_like_committed_tree()
41
 
        self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
 
42
        self.time(self.run_bzr, 'bundle', '--revision', '..-1')
42
43
 
43
44
    def test_create_bundle_many_commit_tree (self):
44
 
        """Create a bundle for a tree with many commits but no changes."""
 
45
        """Create a bundle for a tree with many commits but no changes.""" 
45
46
        self.make_many_commit_tree()
46
 
        self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
 
47
        self.time(self.run_bzr, 'bundle', '--revision', '..-1')
47
48
 
48
49
    def test_create_bundle_heavily_merged_tree(self):
49
 
        """Create a bundle for a heavily merged tree."""
 
50
        """Create a bundle for a heavily merged tree.""" 
50
51
        self.make_heavily_merged_tree()
51
 
        self.time(self.run_bzr, ['bundle', '--revision', '..-1'])
52
 
 
 
52
        self.time(self.run_bzr, 'bundle', '--revision', '..-1')
 
53
        
53
54
    def test_apply_bundle_known_kernel_like_tree(self):
54
55
        """Create a bundle for a kernel sized tree with no ignored, unknowns,
55
56
        or added and one commit.
56
 
        """
 
57
        """ 
57
58
        tree = self.make_kernel_like_committed_tree('tree')
58
59
 
59
60
        f = open('bundle', 'wb')
65
66
 
66
67
        tree2 = self.make_branch_and_tree('branch_a')
67
68
        os.chdir('branch_a')
68
 
        self.time(self.run_bzr, ['merge', '../bundle'])
69
 
 
 
69
        self.time(self.run_bzr, 'merge', '../bundle')
 
70
 
70
71
 
71
72
class BundleLibraryLevelWriteBenchmark(Benchmark):
72
73
    """ Benchmarks for the write_bundle library function. """
183
184
 
184
185
 
185
186
if __name__ == '__main__':
186
 
    # USE the following if you want to regenerate the above test functions
 
187
    # USE the following if you want to regenerate the above test functions 
187
188
    for treesize, treesize_h in [(5, "small"), (100, "moderate"),
188
189
                                 (1000, "big")]:
189
190
        for bundlefiles, bundlefiles_h in [(5, "few"), (100, "some")]:
190
191
            if bundlefiles > treesize:
191
192
                continue
192
193
            for num_revisions in [1, 100]:
193
 
                if (num_revisions >= 100 and
 
194
                if (num_revisions >= 100 and 
194
195
                        (bundlefiles >= 100 or treesize >= 1000)):
195
196
                    # Skip the 100x100x? tests.
196
197
                    # And the 100x?x1000