[tor-commits] [ooni-probe/master] set command

[art at torproject.org]

commit 0a9856c9d4fd8741caf71c74c80f755f8e607ca3
Author: aagbsn <aagbsn at extc.org>
Date:   Mon Apr 6 14:17:04 2015 +0000

    set command
---
 ooni/nettests/third_party/lantern.py |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ooni/nettests/third_party/lantern.py b/ooni/nettests/third_party/lantern.py
index 37fe840..896e11e 100644
--- a/ooni/nettests/third_party/lantern.py
+++ b/ooni/nettests/third_party/lantern.py
@@ -62,20 +62,17 @@ class LanternTest(ProcessTest):
     requiredOptions = ['url']
 
     def setUp(self):
+        self.command = ["lantern_linux", "--headless"]
         self.d = defer.Deferred()
         self.processDirector = LanternProcessDirector(self.d, timeout=self.timeout)
-        self.d.addCallback(self.processEnded, "lantern_linux")
+        self.d.addCallback(self.processEnded, self.command)
         if self.localOptions['url']:
             self.url = self.localOptions['url']
 
     def runLantern(self):
-        command = ["lantern_linux", "--headless"]
-
-        paths = filter(os.path.exists,[os.path.join(os.path.expanduser(x), command[0]) for x in getenv('PATH').split(':')])
-        if paths:
-            command[0] = paths[0]
+        paths = filter(os.path.exists,[os.path.join(os.path.expanduser(x), self.command[0]) for x in getenv('PATH').split(':')])
         log.debug("Spawning Lantern")
-        reactor.spawnProcess(self.processDirector, command[0], command)
+        reactor.spawnProcess(self.processDirector, paths[0], self.command)
 
     def test_lantern_circumvent(self):
         proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1', 8787)