Rev 4908: Cleanup the tests, as done in the client-stream-started code. in http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604

------------------------------------------------------------
revno: 4908
revision-id: john at arbash-meinel.com-20111010120648-h5er54hkfzmowt3j
parent: john at arbash-meinel.com-20111010120313-3gqshhjwkol0ed93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-client-reconnect-819604
timestamp: Mon 2011-10-10 14:06:48 +0200
message:
  Cleanup the tests, as done in the client-stream-started code.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2011-10-10 12:03:13 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2011-10-10 12:06:48 +0000
@@ -3428,9 +3428,10 @@
         output, vendor, smart_client = self.make_client_with_failing_medium()
         smart_request = client._SmartClientRequest(smart_client, 'hello', ())
         handler = smart_request._send(3)
-        message_sent = output.getvalue()
-        self.assertStartsWith(message_sent, 'bzr message 3 (bzr 1.6)\n')
-        self.assertEndsWith(message_sent, 's\x00\x00\x00\tl5:helloee')
+        self.assertEqual('bzr message 3 (bzr 1.6)\n' # protocol
+                         '\x00\x00\x00\x02de'   # empty headers
+                         's\x00\x00\x00\tl5:helloee',
+                         output.getvalue())
         self.assertEqual(
             [('connect_ssh', 'a user', 'a pass', 'a host', 'a port',
               ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes']),
@@ -3445,9 +3446,10 @@
             fail_at_write=False)
         smart_request = client._SmartClientRequest(smart_client, 'hello', ())
         handler = smart_request._send(3)
-        message_sent = output.getvalue()
-        self.assertStartsWith(message_sent, 'bzr message 3 (bzr 1.6)\n')
-        self.assertEndsWith(message_sent, 's\x00\x00\x00\tl5:helloee')
+        self.assertEqual('bzr message 3 (bzr 1.6)\n' # protocol
+                         '\x00\x00\x00\x02de'   # empty headers
+                         's\x00\x00\x00\tl5:helloee',
+                         output.getvalue())
         self.assertEqual(
             [('connect_ssh', 'a user', 'a pass', 'a host', 'a port',
               ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes']),