Merge pull request #246 from dw/issue179

issue #179: ec0_receive() and connect_bootstrap() should use deadline.

.travis.yml

@@ -1,4 +1,7 @@
 sudo: required
+addons:
+  apt:
+    update: true
 
 notifications:
   email: false

mitogen/parent.py

@@ -756,11 +756,10 @@ class Stream(mitogen.core.Stream):
     def _ec0_received(self):
         LOG.debug('%r._ec0_received()', self)
         write_all(self.transmit_side.fd, self.get_preamble())
-        discard_until(self.receive_side.fd, 'EC1\n', time.time() + 10.0)
+        discard_until(self.receive_side.fd, 'EC1\n', self.connect_deadline)
 
     def _connect_bootstrap(self, extra_fd):
-        deadline = time.time() + self.connect_timeout
+        discard_until(self.receive_side.fd, 'EC0\n', self.connect_deadline)
-        discard_until(self.receive_side.fd, 'EC0\n', deadline)
         self._ec0_received()