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

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-25 17:47:10 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-20061025174710-b8bea783ced1169f
Fix the race condition again and correct some small typos to be in
line with the incremental patches to be proposed.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): Why not inverting them ?

* bzrlib/tests/test_http.py:
(TestWallServer.test_http_has): Whatever we try, httplib still may
raise BadStatusLine, which will be translated to
InvalidHttpResponse, so catch that too.

* bzrlib/tests/HTTPTestUtil.py:
(WallRequestHandler.handle_one_request): Previous fix was not
enough, revert it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_sftp.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 performance over SFTP"""
18
18
 
39
39
        if not paramiko_loaded:
40
40
            raise TestSkipped('you must have paramiko to run this test')
41
41
        test_sftp_transport.set_test_transport_to_sftp(self)
42
 
 
 
42
         
43
43
    def test_branch(self):
44
44
        os.mkdir("a")
45
45
        tree, files = self.create_with_commits(100, 100, "a")
56
56
 
57
57
    def test_pull_1(self):
58
58
        self.create_commit_and_pull(1)
59
 
 
 
59
        
60
60
    def test_pull_10(self):
61
61
        self.create_commit_and_pull(10)
62
62
 
93
93
 
94
94
 
95
95
class SFTPSlowSocketBenchmark(SFTPBenchmark):
96
 
    """Benchmarks of SFTP performance with a 30ms delay per roundtrip."""
97
 
 
98
96
    def setUp(self):
99
97
        super(SFTPSlowSocketBenchmark, self).setUp()
100
98
        self.get_server().add_latency = 0.03