~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-01-29 22:10:24 UTC
mfrom: (1185.50.57 bzr-jam-integration)
mto: (1534.11.2 test-pb) (1553.5.2 bzr.dev (Main development branch)) (1185.50.76 bzr-jam-integration) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1550.
Revision ID: robertc@robertcollins.net-20060129221024-3fb7b838e5cd3e02

Merge from jam-integration

added added

removed removed

896

self._socket.close()

897

try:

898

self._callback(s, self.stop_event)

899

except socket.error:

900

pass #Ignore socket errors

899

901

except Exception, x:

900

902

# probably a failed test

901

903

warning('Exception from within unit test server thread: %r' % x)