[rfc] [patch] sftp unit tests without ssh

John Arbash Meinel john at arbash-meinel.com
Tue Jan 24 20:00:36 GMT 2006


Robey Pointer wrote:
> 
> On 23 Jan 2006, at 17:46, John Arbash Meinel wrote:
> 
>> So I don't think we have to worry about maintaining bzr compatibility
>> with every revision in paramiko. But you didn't have a fix yet.
>> That and I'm having trouble pulling the tree now, because it fails to
>> install revisions.
> 
> 
> Does this work now, btw?
> 

I don't seem to have any problems pulling your paramiko tree now.

> 
>>
>>> Well, good news and bad news.  The good news is that I get the same
>>> speedup with a bzr.dev.sftp + bzr.jam monster merge.  The bad news is
>>> that it has 19 failures and 50 errors.  They're all in non-sftp- 
>>> related
>>> code.  Also I had 3 conflicts during the merge (again, none   related to
>>> my changes).  I think if you merge up with bzr.dev first  you  might
>>> have
>>> better luck, but it looks like the 2 trees have  diverged too much 
>>> right
>>> now.
>>
>>
>> I just merged bzr.dev. bzr.dev has merged all of me through Robert's
>> integration branch. So I'm not sure why you have changes showing up.
>>
>> Something seems odd with your setup, as I don't seem to have the same
>> issues on my end.
> 
> 
> I think trying to cross merge over such a long distance was just 
> confusing it.  I did the following this morning:
> 
> * update bzr.dev
> * merge bzr.dev -> my sftp branch
> * update jam-integration
> * merge my sftp branch into jam-integration
> 
> This time no conflicts, and a short merge.  It looks like it worked 
> against jam-integration, so I have confidence that if you try again, 
> this time it'll work:
> 
> selftest on jam-integration: 320 seconds
> selftest on bzr.dev.sftp: 191 seconds
> selftest on jam-integration after merge: 186 seconds

On my fast machine, with the latest jam-integration (1511)
	Ran 724 tests in 113.763s
	real    1m57.855s

After merging bzr.dev.sftp:
	Ran 725 tests in 48.741s
	real    0m52.820s

Which is a rather huge improvement.

However, after merging you I get:
~bzr: WARNING: Exception from within unit test server thread:
<socket.error instance at 0xb6b6894c>
~bzr: WARNING: Exception from within unit test server thread:
<socket.error instance at 0xb6b68bac>
~bzr: WARNING: Exception from within unit test server thread:
<socket.error instance at 0xb6b6582c>

Probably we should also us 'log_exception_quietly()' which puts a
traceback into ~/.bzr.log, which would help debug this.

John
=:->

> 
> (This is on my laptop, disconnected, while playing loud music.   You'll
> get better times.) :)
> 
> I've updated my "bzr.dev.sftp" branch at <http://www.lag.net/~robey/
> bzr.dev.sftp> with the bzr.dev merge.
> 
> robey
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060124/d67e127c/attachment.pgp 


More information about the bazaar mailing list