/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_xml.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-12 14:29:32 UTC
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061012142932-7221fe16d2b48fa3
Shuffle http related test code. Hopefully it ends up at the right place :)

* bzrlib/tests/HttpServer.py: 
New file. bzrlib.tests.ChrootedTestCase use HttpServer. So the
class can't be defined in bzrlib.tests.HTTPUtils because it
creates a circular dependency (bzrlib.tests.HTTPUtils needs to
import bzrlib.tests).

* bzrlib/transport/http/_urllib.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/_pycurl.py: 
Transfer test server definition to bzrlib.tests.HttpServer. Clean
up imports.

* bzrlib/transport/http/__init__.py: 
Transfer all test related code to either bzrlib.tests.HttpServer
and bzrlib.tests.HTTPUtils.
Fix all use of TransportNotPossible and InvalidURL by prefixing it
by 'errors.' (this seems to be the preferred way in the rest of
bzr).
Get rid of unused imports.

* bzrlib/tests/test_transport.py:
(ReadonlyDecoratorTransportTest.test_local_parameters,
FakeNFSDecoratorTests.test_http_parameters): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_sftp_transport.py:
(set_test_transport_to_sftp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

* bzrlib/tests/test_selftest.py:
(TestTestCaseWithTransport.test_get_readonly_url_http): Use
HttpServer from bzrlib.tests.HttpServer instead of
bzrlib.transport.http.

* bzrlib/tests/test_repository.py: 
Does *not* use HttpServer.

* bzrlib/tests/test_http.py: 
Build on top of bzrlib.tests.HttpServer and bzrlib.tests.HTTPUtils
instead of bzrlib.transport.http.

* bzrlib/tests/test_bzrdir.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_http.py:
(HTTPBranchTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/branch_implementations/test_branch.py:
(ChrootedTests.setUp): Use HttpServer from bzrlib.tests.HttpServer
instead of bzrlib.transport.http.

* bzrlib/tests/__init__.py:
(ChrootedTestCase.setUp): Use HttpServer from
bzrlib.tests.HttpServer instead of bzrlib.transport.http.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_xml.py
 
1
# Copyright (C) 2006 by Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License version 2 as published by
 
5
# the Free Software Foundation.
 
6
#
 
7
# This program is distributed in the hope that it will be useful,
 
8
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
9
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
10
# GNU General Public License for more details.
 
11
#
 
12
# You should have received a copy of the GNU General Public License
 
13
# along with this program; if not, write to the Free Software
 
14
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
 
 
16
"""Tests for bzr xml serialization performance."""
 
17
 
 
18
from bzrlib import (
 
19
    cache_utf8,
 
20
    xml5,
 
21
    )
 
22
from bzrlib.benchmarks import Benchmark
 
23
 
 
24
 
 
25
class BenchXMLSerializer(Benchmark):
 
26
 
 
27
    def test_write_to_string_kernel_like_inventory(self):
 
28
        # On jam's machine, ElementTree serializer took: 2161ms/13487ms
 
29
        #                      with Robert's serializer:  631ms/10770ms
 
30
        #                      with Entity escaper:       487ms/11636ms
 
31
        #           caching Entity escaper, empty cache:  448ms/ 9489ms
 
32
        #           caching Entity escaper, full cache:   375ms/ 9489ms
 
33
        #                      passing around function:   406ms/ 8942ms
 
34
        #              cached, passing around function:   328ms/11248ms
 
35
        #                      removing extra function:   354ms/ 8942ms
 
36
        #              cached, removing extra function:   275ms/11248ms
 
37
        #                          no cache, real utf8:   363ms/11697ms
 
38
        #                            cached, real utf8:   272ms/12827ms
 
39
        # Really all we want is a real inventory
 
40
        inv = self.make_kernel_like_inventory()
 
41
 
 
42
        xml5._clear_cache()
 
43
        # We want a real tree with lots of file ids and sha strings, etc.
 
44
        self.time(xml5.serializer_v5.write_inventory_to_string, inv)
 
45
 
 
46
    def test_write_kernel_like_inventory(self):
 
47
        # Really all we want is a real inventory
 
48
        inv = self.make_kernel_like_inventory()
 
49
 
 
50
        xml5._clear_cache()
 
51
        f = open('kernel-like-inventory', 'wb')
 
52
        try:
 
53
            # We want a real tree with lots of file ids and sha strings, etc.
 
54
            self.time(xml5.serializer_v5.write_inventory, inv, f)
 
55
        finally:
 
56
            f.close()
 
57
 
 
58
    def test_write_to_string_cached_kernel_like_inventory(self):
 
59
        inv = self.make_kernel_like_inventory()
 
60
 
 
61
        xml5._clear_cache()
 
62
        # We want a real tree with lots of file ids and sha strings, etc.
 
63
        xml5.serializer_v5.write_inventory_to_string(inv)
 
64
 
 
65
        self.time(xml5.serializer_v5.write_inventory_to_string, inv)
 
66
 
 
67
    def test_read_from_string_kernel_like_inventory(self):
 
68
        inv = self.make_kernel_like_inventory()
 
69
        as_str = xml5.serializer_v5.write_inventory_to_string(inv)
 
70
 
 
71
        cache_utf8.clear_encoding_cache()
 
72
        read_inv = self.time(xml5.serializer_v5.read_inventory_from_string,
 
73
                             as_str)
 
74
        # TODO: make sure the final inventory is equal as a sanity check
 
75
 
 
76
    def test_read_from_string_cached_kernel_like_inventory(self):
 
77
        cache_utf8.clear_encoding_cache()
 
78
        inv = self.make_kernel_like_inventory()
 
79
        as_str = xml5.serializer_v5.write_inventory_to_string(inv)
 
80
 
 
81
        xml5.serializer_v5.read_inventory_from_string(as_str)
 
82
 
 
83
        read_inv = self.time(xml5.serializer_v5.read_inventory_from_string,
 
84
                             as_str)
 
85
        # TODO: make sure the final inventory is equal as a sanity check