Breezy

Merge lp:~jelmer/brz/python3-httpish into lp:brz

  1. python3-httpish
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/python3-httpish
Merge into: lp:brz
Diff against target: 120 lines (+28/-6)
3 files modified
breezy/tests/test_http_response.py (+3/-1)
breezy/transport/http/_urllib2_wrappers.py (+1/-1)
python3.passing (+24/-4)
To merge this branch: bzr merge lp:~jelmer/brz/python3-httpish
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+353132@code.launchpad.net

Description of the change

Fix another 28 HTTP tests on Python 3.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/411/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/tests/test_http_response.py'
--- breezy/tests/test_http_response.py 2018-06-20 21:37:51 +0000
+++ breezy/tests/test_http_response.py 2018-08-15 01:38:18 +0000
@@ -39,8 +39,10 @@
3939
40try:40try:
41 import http.client as http_client41 import http.client as http_client
42 parse_headers = http_client.parse_headers
42except ImportError: # python < 343except ImportError: # python < 3
43 import httplib as http_client44 import httplib as http_client
45 parse_headers = http_client.HTTPMessage
4446
45from .. import (47from .. import (
46 errors,48 errors,
@@ -719,7 +721,7 @@
719 status_and_headers = BytesIO(raw_headers)721 status_and_headers = BytesIO(raw_headers)
720 # Get rid of the status line722 # Get rid of the status line
721 status_and_headers.readline()723 status_and_headers.readline()
722 msg = http_client.HTTPMessage(status_and_headers)724 msg = parse_headers(status_and_headers)
723 return msg725 return msg
724726
725 def get_response(self, a_response):727 def get_response(self, a_response):
726728
=== modified file 'breezy/transport/http/_urllib2_wrappers.py'
--- breezy/transport/http/_urllib2_wrappers.py 2018-08-01 22:51:01 +0000
+++ breezy/transport/http/_urllib2_wrappers.py 2018-08-15 01:38:18 +0000
@@ -770,7 +770,7 @@
770 url = request.get_full_url()770 url = request.get_full_url()
771 print(' Failed again, %s %r' % (method, url))771 print(' Failed again, %s %r' % (method, url))
772 print(' Will raise: [%r]' % my_exception)772 print(' Will raise: [%r]' % my_exception)
773 reraise(my_exception, None, exc_tb)773 reraise(type(my_exception), my_exception, exc_tb)
774 return response774 return response
775775
776 def do_open(self, http_class, request, first_try=True):776 def do_open(self, http_class, request, first_try=True):
777777
=== modified file 'python3.passing'
--- python3.passing 2018-08-08 02:10:06 +0000
+++ python3.passing 2018-08-15 01:38:18 +0000
@@ -9130,16 +9130,16 @@
9130breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RemoteRepositoryFormat-v2)9130breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RemoteRepositoryFormat-v2)
9131breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2a)9131breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2a)
9132breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2aSubtree)9132breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2aSubtree)
9133breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-default)
9134breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-v2)
9135breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2a)
9136breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2aSubtree)
9137breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5)9133breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5)
9138breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRoot)9134breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRoot)
9139breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRootBroken)9135breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRootBroken)
9140breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6)9136breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6)
9141breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6RichRoot)9137breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6RichRoot)
9142breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatPackDevelopment2Subtree)9138breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatPackDevelopment2Subtree)
9139breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-default)
9140breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-v2)
9141breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2a)
9142breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2aSubtree)
9143breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5)9143breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5)
9144breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRoot)9144breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRoot)
9145breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRootBroken)9145breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRootBroken)
@@ -24679,7 +24679,13 @@
24679breezy.tests.test_http_response.TestHandleResponse.test_full_text_no_content_type24679breezy.tests.test_http_response.TestHandleResponse.test_full_text_no_content_type
24680breezy.tests.test_http_response.TestHandleResponse.test_invalid_response24680breezy.tests.test_http_response.TestHandleResponse.test_invalid_response
24681breezy.tests.test_http_response.TestHandleResponse.test_missing_content_range24681breezy.tests.test_http_response.TestHandleResponse.test_missing_content_range
24682breezy.tests.test_http_response.TestHandleResponse.test_multipart_no_boundary
24682breezy.tests.test_http_response.TestHandleResponse.test_multipart_no_content_range24683breezy.tests.test_http_response.TestHandleResponse.test_multipart_no_content_range
24684breezy.tests.test_http_response.TestHandleResponse.test_multi_range
24685breezy.tests.test_http_response.TestHandleResponse.test_multi_squid_range
24686breezy.tests.test_http_response.TestHandleResponse.test_single_range
24687breezy.tests.test_http_response.TestHandleResponse.test_single_range_no_content
24688breezy.tests.test_http_response.TestHandleResponse.test_single_range_truncated
24683breezy.tests.test_http_response.TestHTTPConnection.test_cleanup_pipe24689breezy.tests.test_http_response.TestHTTPConnection.test_cleanup_pipe
24684breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_can_read_at_first_access24690breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_can_read_at_first_access
24685breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_checked_read_dont_overflow_buffers24691breezy.tests.test_http_response.TestRangeFileMultipleRangesQuotedBoundaries.test_checked_read_dont_overflow_buffers
@@ -24839,8 +24845,14 @@
24839breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,basic)24845breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,basic)
24840breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,basicdigest)24846breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,basicdigest)
24841breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,digest)24847breezy.tests.test_http.TestAuth.test_wrong_pass(urllib,HTTP/1.1,digest)
24848breezy.tests.test_http.TestBadProtocolServer.test_http_get(urllib,HTTP/1.0)
24849breezy.tests.test_http.TestBadProtocolServer.test_http_get(urllib,HTTP/1.1)
24850breezy.tests.test_http.TestBadProtocolServer.test_http_has(urllib,HTTP/1.0)
24851breezy.tests.test_http.TestBadProtocolServer.test_http_has(urllib,HTTP/1.1)
24842breezy.tests.test_http.TestBadStatusServer.test_http_get(urllib,HTTP/1.0)24852breezy.tests.test_http.TestBadStatusServer.test_http_get(urllib,HTTP/1.0)
24853breezy.tests.test_http.TestBadStatusServer.test_http_get(urllib,HTTP/1.1)
24843breezy.tests.test_http.TestBadStatusServer.test_http_has(urllib,HTTP/1.0)24854breezy.tests.test_http.TestBadStatusServer.test_http_has(urllib,HTTP/1.0)
24855breezy.tests.test_http.TestBadStatusServer.test_http_has(urllib,HTTP/1.1)
24844breezy.tests.test_http.TestDoCatchRedirections.test_no_redirection(urllib,HTTP/1.0)24856breezy.tests.test_http.TestDoCatchRedirections.test_no_redirection(urllib,HTTP/1.0)
24845breezy.tests.test_http.TestDoCatchRedirections.test_no_redirection(urllib,HTTP/1.1)24857breezy.tests.test_http.TestDoCatchRedirections.test_no_redirection(urllib,HTTP/1.1)
24846breezy.tests.test_http.TestDoCatchRedirections.test_one_redirection(urllib,HTTP/1.0)24858breezy.tests.test_http.TestDoCatchRedirections.test_one_redirection(urllib,HTTP/1.0)
@@ -24851,6 +24863,8 @@
24851breezy.tests.test_http.TestForbiddenServer.test_http_get(urllib,HTTP/1.1)24863breezy.tests.test_http.TestForbiddenServer.test_http_get(urllib,HTTP/1.1)
24852breezy.tests.test_http.TestForbiddenServer.test_http_has(urllib,HTTP/1.0)24864breezy.tests.test_http.TestForbiddenServer.test_http_has(urllib,HTTP/1.0)
24853breezy.tests.test_http.TestForbiddenServer.test_http_has(urllib,HTTP/1.1)24865breezy.tests.test_http.TestForbiddenServer.test_http_has(urllib,HTTP/1.1)
24866breezy.tests.test_http.TestHTTPConnections.test_has_on_bogus_host(urllib,HTTP/1.0)
24867breezy.tests.test_http.TestHTTPConnections.test_has_on_bogus_host(urllib,HTTP/1.1)
24854breezy.tests.test_http.TestHTTPConnections.test_http_get(urllib,HTTP/1.0)24868breezy.tests.test_http.TestHTTPConnections.test_http_get(urllib,HTTP/1.0)
24855breezy.tests.test_http.TestHTTPConnections.test_http_get(urllib,HTTP/1.1)24869breezy.tests.test_http.TestHTTPConnections.test_http_get(urllib,HTTP/1.1)
24856breezy.tests.test_http.TestHTTPConnections.test_http_has_not_found(urllib,HTTP/1.0)24870breezy.tests.test_http.TestHTTPConnections.test_http_has_not_found(urllib,HTTP/1.0)
@@ -24888,7 +24902,9 @@
24888breezy.tests.test_http.TestHttpTransportUrls.test_http_root_urls(urllib)24902breezy.tests.test_http.TestHttpTransportUrls.test_http_root_urls(urllib)
24889breezy.tests.test_http.TestHttpTransportUrls.test_invalid_http_urls(urllib)24903breezy.tests.test_http.TestHttpTransportUrls.test_invalid_http_urls(urllib)
24890breezy.tests.test_http.TestInvalidStatusServer.test_http_get(urllib,HTTP/1.0)24904breezy.tests.test_http.TestInvalidStatusServer.test_http_get(urllib,HTTP/1.0)
24905breezy.tests.test_http.TestInvalidStatusServer.test_http_get(urllib,HTTP/1.1)
24891breezy.tests.test_http.TestInvalidStatusServer.test_http_has(urllib,HTTP/1.0)24906breezy.tests.test_http.TestInvalidStatusServer.test_http_has(urllib,HTTP/1.0)
24907breezy.tests.test_http.TestInvalidStatusServer.test_http_has(urllib,HTTP/1.1)
24892breezy.tests.test_http.TestLimitedRangeRequestServer.test_few_ranges(urllib,HTTP/1.0)24908breezy.tests.test_http.TestLimitedRangeRequestServer.test_few_ranges(urllib,HTTP/1.0)
24893breezy.tests.test_http.TestLimitedRangeRequestServer.test_few_ranges(urllib,HTTP/1.1)24909breezy.tests.test_http.TestLimitedRangeRequestServer.test_few_ranges(urllib,HTTP/1.1)
24894breezy.tests.test_http.TestLimitedRangeRequestServer.test_more_ranges(urllib,HTTP/1.0)24910breezy.tests.test_http.TestLimitedRangeRequestServer.test_more_ranges(urllib,HTTP/1.0)
@@ -25066,6 +25082,10 @@
25066breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.0)25082breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.0)
25067breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.1)25083breezy.tests.test_http.TestTruncatedMultipleRangeServer.test_readv_with_short_reads(urllib,HTTP/1.1)
25068breezy.tests.test_http.TestUrllib2AuthHandler.test_get_user_password_without_port25084breezy.tests.test_http.TestUrllib2AuthHandler.test_get_user_password_without_port
25085breezy.tests.test_http.TestWallServer.test_http_get(urllib,HTTP/1.0)
25086breezy.tests.test_http.TestWallServer.test_http_get(urllib,HTTP/1.1)
25087breezy.tests.test_http.TestWallServer.test_http_has(urllib,HTTP/1.0)
25088breezy.tests.test_http.TestWallServer.test_http_has(urllib,HTTP/1.1)
25069breezy.tests.test_i18n.LoadPluginTranslations.test_does_not_exist25089breezy.tests.test_i18n.LoadPluginTranslations.test_does_not_exist
25070breezy.tests.test_i18n.TestGetTextPerParagraph.test_multiline25090breezy.tests.test_i18n.TestGetTextPerParagraph.test_multiline
25071breezy.tests.test_i18n.TestGetTextPerParagraph.test_oneline25091breezy.tests.test_i18n.TestGetTextPerParagraph.test_oneline

Subscribers

People subscribed via source and target branches