Merge lp:~vila/bzr/781140-ftp-test-coverage into lp:bzr
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | John A Meinel | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5960 | ||||
Proposed branch: | lp:~vila/bzr/781140-ftp-test-coverage | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
126 lines (+57/-12) 3 files modified
bzrlib/tests/ftp_server/__init__.py (+19/-2) bzrlib/tests/ftp_server/pyftpdlib_based.py (+33/-10) doc/en/release-notes/bzr-2.4.txt (+5/-0) |
||||
To merge this branch: | bzr merge lp:~vila/bzr/781140-ftp-test-coverage | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+63652@code.launchpad.net |
Commit message
Support pyftplib-0.6.0 as an ftp test server
Description of the change
We supported two ftp test servers in the past: medusa and pyftpdlib.
Medusa stopped working with python-2.6 due to some
incompatibilities with unicode.
pyftpdlib is not packaged and as such poorly deployed in our ecosystem.
This patch does two things:
- upgrade our test framework to support pyftpdlib 0.6.0,
- disable medusa while keeping the plumbing in place in case the
unicode issues are addressed in the future. python-3 may help.
Note that the medusa plumbing was removed when we made python-2.6
a requirement. I had to dig a bit to find it back and I like to
keep it disabled (instead of removed) to make it easier to use it
again. An alternative would be fully purge the test framework
from all medusa references but that's more work for little
benefits. Roughly, we try to import and disable support, less
trouble than digging the history.
This patch needs to land before we can deploy pyftpdlib again, be
it on babune or pqm or both.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 6/7/2011 9:18 AM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/781140-ftp-test-coverage into lp:bzr.
...
> Note that the medusa plumbing was removed when we made python-2.6
> a requirement. I had to dig a bit to find it back and I like to
> keep it disabled (instead of removed) to make it easier to use it
> again. An alternative would be fully purge the test framework
> from all medusa references but that's more work for little
> benefits. Roughly, we try to import and disable support, less
> trouble than digging the history.
>
> This patch needs to land before we can deploy pyftpdlib again, be
> it on babune or pqm or both.
+if pyftplib_version < (0, 6,0):
Spacing is wrong on this one.
Otherwise:
merge: approve
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk3 t3MQACgkQJdeBCY SNAAP4vACcDqu5E qBCzq0ZnJki9+ zh1dFf 4Ni2KlAJ7TvPlYb +c
Kp0AoJuuQXKx3Ez
=Ig3r
-----END PGP SIGNATURE-----