##// END OF EJS Templates
merge: respect bookmarks during merge...
merge: respect bookmarks during merge Bookmarks will behave more like named branches when merge tries to pick a revision to merge. Bookmarks now to respect the current bookmarks. Bookmarks will not accidentally merged with unnamed heads or other bookmarks. However merge can pick heads with diverging bookmarks and pick those automatically. We end up with two cases for picking a revision to merge: (1) In case of an current bookmark, merge can pick a branch head that has a diverged bookmark (2) In case of no current bookmark, merge can pick a branch head that does not have a bookmark.

File last commit:

r16643:24dbef11 default
r16708:4a02cf4f default
Show More
test_proxy_support.py
171 lines | 7.0 KiB | text/x-python | PythonLexer
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 # Copyright 2010, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import unittest
import socket
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 import httpplus
Augie Fackler
Import new http library as mercurial.httpclient....
r14243
# relative import to ease embedding the library
import util
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 def make_preloaded_socket(data, close=False):
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 """Make a socket pre-loaded with data so it can be read during connect.
Useful for https proxy tests because we have to read from the
socket during _connect rather than later on.
"""
def s(*args, **kwargs):
sock = util.MockSocket(*args, **kwargs)
Augie Fackler
httpclient: import revision fc731618702a of py-nonblocking-http
r14376 sock.early_data = data[:]
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 sock.close_on_empty = close
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 return sock
return s
class ProxyHttpTest(util.HttpTestBase, unittest.TestCase):
def _run_simple_test(self, host, server_data, expected_req, expected_data):
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 con = httpplus.HTTPConnection(host)
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 con._connect()
con.sock.data = server_data
con.request('GET', '/')
self.assertEqual(expected_req, con.sock.sent)
self.assertEqual(expected_data, con.getresponse().read())
def testSimpleRequest(self):
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 con = httpplus.HTTPConnection('1.2.3.4:80',
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 proxy_hostport=('magicproxy', 4242))
con._connect()
con.sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'MultiHeader: Value\r\n'
'MultiHeader: Other Value\r\n'
'MultiHeader: One More!\r\n'
'Content-Length: 10\r\n',
'\r\n'
'1234567890'
]
con.request('GET', '/')
expected_req = ('GET http://1.2.3.4/ HTTP/1.1\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n\r\n')
self.assertEqual(('127.0.0.42', 4242), con.sock.sa)
self.assertStringEqual(expected_req, con.sock.sent)
resp = con.getresponse()
self.assertEqual('1234567890', resp.read())
self.assertEqual(['Value', 'Other Value', 'One More!'],
resp.headers.getheaders('multiheader'))
self.assertEqual(['BogusServer 1.0'],
resp.headers.getheaders('server'))
def testSSLRequest(self):
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 con = httpplus.HTTPConnection('1.2.3.4:443',
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 proxy_hostport=('magicproxy', 4242))
socket.socket = make_preloaded_socket(
['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'Content-Length: 10\r\n',
'\r\n'
'1234567890'])
con._connect()
Augie Fackler
httpclient: import revision fc731618702a of py-nonblocking-http
r14376 con.sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'Content-Length: 10\r\n',
'\r\n'
'1234567890'
]
connect_sent = con.sock.sent
con.sock.sent = ''
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 con.request('GET', '/')
Augie Fackler
httpclient: import revision fc731618702a of py-nonblocking-http
r14376 expected_connect = ('CONNECT 1.2.3.4:443 HTTP/1.0\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n'
'\r\n')
expected_request = ('GET / HTTP/1.1\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n\r\n')
Augie Fackler
Import new http library as mercurial.httpclient....
r14243
self.assertEqual(('127.0.0.42', 4242), con.sock.sa)
Augie Fackler
httpclient: import revision fc731618702a of py-nonblocking-http
r14376 self.assertStringEqual(expected_connect, connect_sent)
self.assertStringEqual(expected_request, con.sock.sent)
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 resp = con.getresponse()
self.assertEqual(resp.status, 200)
self.assertEqual('1234567890', resp.read())
self.assertEqual(['BogusServer 1.0'],
resp.headers.getheaders('server'))
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 def testSSLRequestNoConnectBody(self):
con = httpplus.HTTPConnection('1.2.3.4:443',
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 proxy_hostport=('magicproxy', 4242))
socket.socket = make_preloaded_socket(
Augie Fackler
httpclient: update to revision 892730fe7f46 of httpplus
r16643 ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'\r\n'])
con._connect()
con.sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'Content-Length: 10\r\n',
'\r\n'
'1234567890'
]
connect_sent = con.sock.sent
con.sock.sent = ''
con.request('GET', '/')
expected_connect = ('CONNECT 1.2.3.4:443 HTTP/1.0\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n'
'\r\n')
expected_request = ('GET / HTTP/1.1\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n\r\n')
self.assertEqual(('127.0.0.42', 4242), con.sock.sa)
self.assertStringEqual(expected_connect, connect_sent)
self.assertStringEqual(expected_request, con.sock.sent)
resp = con.getresponse()
self.assertEqual(resp.status, 200)
self.assertEqual('1234567890', resp.read())
self.assertEqual(['BogusServer 1.0'],
resp.headers.getheaders('server'))
def testSSLProxyFailure(self):
con = httpplus.HTTPConnection('1.2.3.4:443',
proxy_hostport=('magicproxy', 4242))
socket.socket = make_preloaded_socket(
['HTTP/1.1 407 Proxy Authentication Required\r\n\r\n'], close=True)
self.assertRaises(httpplus.HTTPProxyConnectFailedException, con._connect)
self.assertRaises(httpplus.HTTPProxyConnectFailedException,
Augie Fackler
Import new http library as mercurial.httpclient....
r14243 con.request, 'GET', '/')
# no-check-code