Merge pull request #323 from glowatsk/ticket226-control-port-status

Ticket226 control port status
meejah · Oct 30, 2018 · eba3518 · eba3518
2 parents 5cac1df + 8c66662
commit eba3518
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/test_controller.py b/test/test_controller.py
@@ -51,7 +51,7 @@ def signalProcess(self, signame):
         )
 
     def closeStdin(self):
-        self.process_protocol.outReceived(b"Bootstrap")
+        self.process_protocol.outReceived(b"Opening Control listener")
         return
 
 
@@ -599,7 +599,7 @@ def test_tor_connection_fails(self, ftb):
         trans = FakeProcessTransport()
 
         def on_protocol(proto):
-            proto.outReceived(b'Bootstrapped 100%\n')
+            proto.outReceived(b'Opening Control listener\n')
         reactor = FakeReactor(self, trans, on_protocol, [1, 2, 3])
 
         fails = ['one']

diff --git a/txtorcon/controller.py b/txtorcon/controller.py
@@ -1234,7 +1234,7 @@ def outReceived(self, data):
         # tor_connection_failed)
         txtorlog.msg(data)
         if not self.attempted_connect and self.connection_creator \
-                and b'Bootstrap' in data:
+                and b'Opening Control listener' in data:
             self.attempted_connect = True
             # hmmm, we don't "do" anything with this Deferred?
             # (should it be connected to the when_connected