[merge] FTP now has and passes regression tests

Robert Collins robertc at robertcollins.net
Fri May 19 01:25:34 BST 2006


On Tue, 2006-05-16 at 16:39 -0500, John Arbash Meinel wrote:
> Attached is the diff for review. Branch available from:
> http://bzr.arbash-meinel.com/branches/bzr/ftp-server/
> 
> 
> Basically, I check to see if 'medusa' is installed, and if so, I create
> a FtpServer which can be used for testing the FtpTransport.
> 
> It turns out that we have to do a lot of semi-bogus error string
> parsing, in order to satisfy all of Transport's requirements. For
> example Transport.has() on a directory. We don't use it, because http
> gives weird responses for it. But it does exist in the test suite (as
> part of the mkdir() tests).
> 
> Anyway, I would guess that our FtpTransport won't give proper exceptions
> when coupled with just any ftp server, since it is parsing the server's
> error message. But hopefully that won't matter too much. (And people can
> give us bug reports when it doesn't work with *their* ftp server).
> 
> So mostly what I did was clean up exception handling, and merge the last
> of the append() changes.
> 
> If anyone actually using ftp could give it a try, I would appreciate it.
> 
> John
> =:->
> 
> plain text document attachment (ftp-server-test.diff)
> === modified file 'NEWS'
> --- NEWS	
> +++ NEWS	
> @@ -2,19 +2,23 @@
>  
>    IMPROVEMENTS:
>  
> -   * On Unix, detect terminal width using an ioctl not just $COLUMNS.
> -     Use terminal width for single-line logs from ``bzr log --line`` and
> -     pending-merge display.  (Robert Widhopf-Fenk, Gustavo Niemeyer)
> -     (Malone #3507)
> -
> -   * On Windows, detect terminal widht using GetConsoleScreenBufferInfo.
> -     (Alexander Belchenko)
> +    * On Unix, detect terminal width using an ioctl not just $COLUMNS.
> +      Use terminal width for single-line logs from ``bzr log --line`` and
> +      pending-merge display.  (Robert Widhopf-Fenk, Gustavo Niemeyer)
> +      (Malone #3507)
> +
> +    * On Windows, detect terminal widht using GetConsoleScreenBufferInfo.
> +      (Alexander Belchenko)
>    
> -    'bzr selftest' now shows a progress bar with the number of tests, and 
> -    progress made. 'make check' shows tests in -v mode, to be more useful
> -    for the PQM status window. (Robert Collins).
> +    * 'bzr selftest' now shows a progress bar with the number of tests, and 
> +      progress made. 'make check' shows tests in -v mode, to be more useful
> +      for the PQM status window. (Robert Collins).
>  
>      * Add info on standalone branches without a working tree.  (Olaf Conradi)
> +
> +    * ftp now has a test server if medusa is installed. As part of testing,
> +      ftp support has been improved, including support for supplying a
> +      non-standard port. (John Arbash Meinel).
>  
> 
>  bzr 0.8  2006-05-08
> 
> === modified file 'bzrlib/repository.py'
> --- bzrlib/repository.py	
> +++ bzrlib/repository.py	
> @@ -1308,7 +1308,7 @@
>                         repository.
>          """
>          mutter('creating repository in %s.', a_bzrdir.transport.base)
> -        dirs = ['knits']
> +        dirs = ['revision-store', 'knits']
>          files = []
>          utf8_files = [('format', self.get_format_string())]


How did you create the diff? It seems to have lots of noise in it.

If you could make a cleaner diff that would be great.

Rob


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060519/cad31713/attachment.pgp 


More information about the bazaar mailing list