[tor-commits] [ooni-probe/master] change new psiphon path to the psiphonpath attribute

[art at torproject.org]

commit 5746afdc25515c553d100d9e77c579b8d72d7d34
Author: juga0 <juga>
Date:   Tue Dec 22 21:10:13 2015 +0000

    change new psiphon path to the psiphonpath attribute
---
 ooni/nettests/third_party/psiphon.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py
index 1e85c78..3129d5e 100644
--- a/ooni/nettests/third_party/psiphon.py
+++ b/ooni/nettests/third_party/psiphon.py
@@ -63,7 +63,7 @@ class PsiphonTest(httpt.HTTPTest,  process.ProcessTest):
             # are in the user's home directory.
             from os import path, getenv
             self.psiphonpath = path.join(
-                getenv('HOME'), 'psiphon-circumvention-system/pyclient')
+                getenv('HOME'), 'psiphon-circumvention-system/pyclient/pyclient')
             log.debug('psiphon path: %s' % self.psiphonpath)
 
         # psi_client.py can not be run directly because the paths in the
@@ -91,6 +91,7 @@ connect(False)
 		self.report['psiphon_installed'] = None
         if not os.path.exists(self.psiphonpath):
             log.err('psiphon path does not exists, is it installed?')
+            self.report['success'] = False
             self.report['psiphon_installed'] = False
             log.debug("Adding %s to report" % self.report)
             # XXX: the original code written by juga0 readed
@@ -110,8 +111,7 @@ connect(False)
         # full with some block size and therefore the test would
         # terminate with error
         finished = self.run(self.command,
-                            env=dict(PYTHONPATH=os.path.join(self.psiphonpath,
-                                                             'pyclient')),
+                            env=dict(PYTHONPATH=self.psiphonpath),
                             path=self.psiphonpath,
                             usePTY=1)