Merge lp:~vila/bzr/1579093-paramako-compat into lp:bzr/2.7

Proposed by Vincent Ladeuil on 2016-11-27
Status: Merged
Approved by: Vincent Ladeuil on 2016-11-28
Approved revision: 6619
Merge reported by: bzr PQM
Merged at revision: not available
Proposed branch: lp:~vila/bzr/1579093-paramako-compat
Merge into: lp:bzr/2.7
Diff against target: 35 lines (+13/-1)
2 files modified
bzrlib/transport/sftp.py (+2/-1)
doc/en/release-notes/bzr-2.7.txt (+11/-0)
To merge this branch: bzr merge lp:~vila/bzr/1579093-paramako-compat
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2016-11-27
Review via email: mp+311890@code.launchpad.net

Commit message

Cope with paramiko making argument to SFTPFile.prefetch() mandatory.

Description of the change

This fixes bug #1579093 by coping with paramiko making argument to SFTPFile.prefetch() mandatory.

The original patch from Jelmer has landed in debian sid for a while as well as in ubuntu.

This is a pre-requisite to enable the new CI system as tests are currently failing on trunk.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Self-approving as the patch is known to work and is blocking landings.

review: Approve
Vincent Ladeuil (vila) wrote :

Still sorting out bzr jenkaas issues. Please do *not* try to land this with pqm.

bzr PQM (bzr-pqm) wrote :
Download full text (3.1 MiB)

The attempt to merge lp:~vila/bzr/1579093-paramako-compat into lp:bzr/2.7 failed. Below is the output from the failed tests.

python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/tutorial.txt "doc/en/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/using_bazaar_with_launchpad.txt "doc/en/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/tutorials/centralized_workflow.txt "doc/en/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/centralized_workflow.txt "doc/ru/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/using_bazaar_with_launchpad.txt "doc/ru/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/tutorials/tutorial.txt "doc/ru/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/tutorial.txt "doc/ja/tutorials/tutorial.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/using_bazaar_with_launchpad.txt "doc/ja/tutorials/using_bazaar_with_launchpad.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/tutorials/centralized_workflow.txt "doc/ja/tutorials/centralized_workflow.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/mini-tutorial/index.txt "doc/en/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/mini-tutorial/index.txt "doc/ja/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ru/mini-tutorial/index.txt "doc/ru/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/es/mini-tutorial/index.txt "doc/es/mini-tutorial/index.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/en/user-guide/index-plain.txt doc/en/user-guide/index-plain.html
python tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning --stylesheet=../../default.css doc/ja/user-guide/index-plain.txt "doc/ja/user-guide/index-plain.html"
python tools/rst2html.py --link-stylesheet --footnote-references=superscript...

Vincent Ladeuil (vila) wrote :

FAIL: bzrlib.tests.test_smart_transport.TestSmartTCPServer.testCompletedTraceback (most recent call last):
testtools.testresult.real._StringException: log: {{{
INFO Requested to stop gracefully
250.591 Stopping SmartServerSocketStreamMedium(client=('127.0.0.1', 36560))
    INFO Requested to stop gracefully
}}}

Traceback (most recent call last):
  File "/home/ubuntu/tarmac-testing/bzrlib/tests/test_smart_transport.py", line 1466, in test_graceful_shutdown_waits_for_clients_to_stop
    """, flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 435, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: Expected:
        INFO Requested to stop gracefully
    ... Stopping SmartServerSocketStreamMedium(client=('127.0.0.1', ...
        INFO Waiting for 1 client(s) to finish
Got:
        INFO Requested to stop gracefully
    250.591 Stopping SmartServerSocketStreamMedium(client=('127.0.0.1', 36560))

Ha ! Known transient issue :-/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/transport/sftp.py'
--- bzrlib/transport/sftp.py 2016-01-21 17:48:07 +0000
+++ bzrlib/transport/sftp.py 2016-11-27 10:42:09 +0000
@@ -410,8 +410,9 @@
410 try:410 try:
411 path = self._remote_path(relpath)411 path = self._remote_path(relpath)
412 f = self._get_sftp().file(path, mode='rb')412 f = self._get_sftp().file(path, mode='rb')
413 size = f.stat().st_size
413 if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):414 if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):
414 f.prefetch()415 f.prefetch(size)
415 return f416 return f
416 except (IOError, paramiko.SSHException), e:417 except (IOError, paramiko.SSHException), e:
417 self._translate_io_exception(e, path, ': error retrieving',418 self._translate_io_exception(e, path, ': error retrieving',
418419
=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- doc/en/release-notes/bzr-2.7.txt 2016-02-01 18:09:33 +0000
+++ doc/en/release-notes/bzr-2.7.txt 2016-11-27 10:42:09 +0000
@@ -5,6 +5,17 @@
5.. toctree::5.. toctree::
6 :maxdepth: 16 :maxdepth: 1
77
8bzr 2.7.1
9#########
10
11
12Bug Fixes
13*********
14
15* Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
16 (Jelmer Vernooij, #1579093)
17
18
8bzr 2.7.019bzr 2.7.0
9#########20#########
1021

Subscribers

People subscribed via source and target branches