Bazaar

Merge lp:~mnordhoff/bzr/461149-paramiko-test-fix-backport into lp:bzr/2.0

  1. 461149-paramiko-test-fix-backport
  2. Merge into 2.0
Proposed by Matt Nordhoff
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mnordhoff/bzr/461149-paramiko-test-fix-backport
Merge into: lp:bzr/2.0
Diff against target: 28 lines
2 files modified
NEWS (+3/-0)
bzrlib/tests/test_selftest.py (+2/-2)
To merge this branch: bzr merge lp:~mnordhoff/bzr/461149-paramiko-test-fix-backport
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+13997@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Nordhoff (mnordhoff) wrote :

This fixes bug #461149 by cherrypicking r4848 of bzr.dev to the 2.0 branch. It was a patch by vila that fixes a couple of typos in test_selftest.

Eh, that was a kind of complicated sentence.

Revision history for this message
Robert Collins (lifeless) wrote :

 +1

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matt Nordhoff wrote:
> Matt Nordhoff has proposed merging lp:~mnordhoff/bzr/461149-paramiko-test-fix-backport into lp:bzr/2.0.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #461149 test_transport_sftp backtraces if paramiko isn't present
> https://bugs.launchpad.net/bugs/461149
>
>
> This fixes bug #461149 by cherrypicking r4848 of bzr.dev to the 2.0 branch. It was a patch by vila that fixes a couple of typos in test_selftest.
>
> Eh, that was a kind of complicated sentence.
>

You should have a NEWS entry for this, but otherwise:

 review: approve
 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkrmI98ACgkQJdeBCYSNAANssACfXwJhRWaDXZ2p0ArPcYLdi1aV
ND8AoJc3SWp8tsplmtrGLW4+SlMCSZrg
=5kdG
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Matt Nordhoff (mnordhoff) wrote :

John A Meinel wrote:
> You should have a NEWS entry for this, but otherwise:
>
> review: approve
> merge: approve
>
> John
> =:->

I just pushed one, FWIW. Launchpad will mirror it...eventually.
--

Updating diff...

An updated diff will be available in a few minutes. Reload to see the changes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-10-21 01:05:40 +0000
3+++ NEWS 2009-10-27 04:09:13 +0000
4@@ -29,6 +29,9 @@
5 fails intermittently with "second push failed to complete".
6 (Andrew Bennetts, #437626)
7
8+* Fix typos left after test_selftest refactoring. (Vincent Ladeuil, Matt
9+ Nordhoff, #461149)
10+
11 * PreviewTree file names are not limited by the encoding of the temp
12 directory's filesystem. (Aaron Bentley, #436794)
13
14
15=== modified file 'bzrlib/tests/test_selftest.py'
16--- bzrlib/tests/test_selftest.py 2009-08-24 05:35:28 +0000
17+++ bzrlib/tests/test_selftest.py 2009-10-27 04:09:13 +0000
18@@ -1877,8 +1877,8 @@
19 def test_transport_sftp(self):
20 try:
21 import bzrlib.transport.sftp
22- except ParamikoNotPresent:
23- raise TestSkipped("Paramiko not present")
24+ except errors.ParamikoNotPresent:
25+ raise tests.TestSkipped("Paramiko not present")
26 self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
27
28 def test_transport_memory(self):

Subscribers

People subscribed via source and target branches