[tor-commits] [ooni-probe/master] Fix lantern test

[art]

commit a9e003e9cd6cc9a2767ab567f6215fb2d92cf603
Author: Arturo Filastò 
Date:   Fri Dec 11 11:39:59 2015 +0100

Fix lantern test
---
 ooni/nettests/third_party/lantern.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/nettests/third_party/lantern.py 
b/ooni/nettests/third_party/lantern.py
index c7173ed..1f1b3b0 100644
--- a/ooni/nettests/third_party/lantern.py
+++ b/ooni/nettests/third_party/lantern.py
@@ -4,7 +4,7 @@ from twisted.python import usage
 from twisted.web.client import ProxyAgent, readBody
 from ooni.templates.process import ProcessTest, ProcessDirector
 from ooni.utils import log
-from ooni.errors import handleAllFailures, TaskTimedOut
+from ooni.errors import handleAllFailures
 import os.path
 from os import getenv
 
@@ -34,7 +34,7 @@ class LanternProcessDirector(ProcessDirector):
 def outReceived(self, data):
 self.stdout += data
 # output received, see if we have bootstrapped
-if not self.bootstrapped.called and "client (http) proxy at" in 
self.stdout:
+if not self.bootstrapped.called and "Connected to proxy on localhost" 
in self.stdout:
 log.debug("Bootstrap Detected")
 self.cancelTimer()
 self.bootstrapped.callback("bootstrapped")
@@ -62,7 +62,7 @@ class LanternTest(ProcessTest):
 requiredOptions = ['url']
 
 def setUp(self):
-self.command = ["lantern_linux", "--headless"]
+self.command = ["lantern", "--headless"]
 self.d = defer.Deferred()
 self.processDirector = LanternProcessDirector(self.d, 
timeout=self.timeout)
 self.d.addCallback(self.processEnded, self.command)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix lantern test

[art]

commit 7a83298091b46a485e0034820561e7ce9b130b02
Author: Arturo Filastò 
Date:   Fri Dec 11 11:39:59 2015 +0100

Fix lantern test
---
 ooni/nettests/third_party/lantern.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/nettests/third_party/lantern.py 
b/ooni/nettests/third_party/lantern.py
index c7173ed..1f1b3b0 100644
--- a/ooni/nettests/third_party/lantern.py
+++ b/ooni/nettests/third_party/lantern.py
@@ -4,7 +4,7 @@ from twisted.python import usage
 from twisted.web.client import ProxyAgent, readBody
 from ooni.templates.process import ProcessTest, ProcessDirector
 from ooni.utils import log
-from ooni.errors import handleAllFailures, TaskTimedOut
+from ooni.errors import handleAllFailures
 import os.path
 from os import getenv
 
@@ -34,7 +34,7 @@ class LanternProcessDirector(ProcessDirector):
 def outReceived(self, data):
 self.stdout += data
 # output received, see if we have bootstrapped
-if not self.bootstrapped.called and "client (http) proxy at" in 
self.stdout:
+if not self.bootstrapped.called and "Connected to proxy on localhost" 
in self.stdout:
 log.debug("Bootstrap Detected")
 self.cancelTimer()
 self.bootstrapped.callback("bootstrapped")
@@ -62,7 +62,7 @@ class LanternTest(ProcessTest):
 requiredOptions = ['url']
 
 def setUp(self):
-self.command = ["lantern_linux", "--headless"]
+self.command = ["lantern", "--headless"]
 self.d = defer.Deferred()
 self.processDirector = LanternProcessDirector(self.d, 
timeout=self.timeout)
 self.d.addCallback(self.processEnded, self.command)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits