← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

  • Committer: Vincent Ladeuil
  • Date: 2014-02-07 10:20:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6590.
  • Revision ID: v.ladeuil+lp@free.fr-20140207102038-17sgslnv35no6bsu
https://launchpad.net/bugs/1269886
Fix test failure on recent Ubuntu Trusty versions without weakening the test itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
1453
1453
        server._stopped.wait()
1454
1454
        # It should not be accepting another connection.
1455
1455
        self.assertRaises(socket.error, self.connect_to_server, server)
1456
 
        # It should also not be fully stopped
1457
 
        server._fully_stopped.wait(0.01)
1458
 
        self.assertFalse(server._fully_stopped.isSet())
1459
1456
        response_handler.read_body_bytes()
1460
1457
        client_sock.close()
1461
1458
        server_side_thread.join()