[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'remotes/gsathya/fix-utils.py' into gsathya

[art at torproject.org]

commit 272bb3fb07db3d09b68f09309e98d9d6a421c44e
Merge: fa6107f 13db3d0
Author: Arturo Filastò <hellais at gmail.com>
Date:   Sun Feb 12 17:15:16 2012 +0100

    Merge remote-tracking branch 'remotes/gsathya/fix-utils.py' into gsathya
    
    Conflicts:
    	refactor/tests/bridget.py

 refactor/tests/bridget.py |  100 ++++++++++++++++++++++++++++++++++++++------
 refactor/utils.py         |   27 ++++++------
 2 files changed, 99 insertions(+), 28 deletions(-)

diff --cc refactor/tests/bridget.py
index e278b33,3e55eb0..ae6a78a
--- a/refactor/tests/bridget.py
+++ b/refactor/tests/bridget.py
@@@ -85,12 -114,27 +114,34 @@@ usemicrodescriptors 
                  ret[cfield[0]] = ' '.join(cfield[1:])
          return ret
  
++<<<<<<< HEAD
++=======
+     #Can't use @torify as it doesn't support concurrency right now 
+     def download_file(self, socksport):
+         time_start=time.time()
+ 
+         opener = urllib2.build_opener(SocksiPyHandler(socks.PROXY_TYPE_SOCKS5,
+                                                       '127.0.0.1', int(socksport)))
+         f = opener.open('http://check.torproject.org')
+         data= f.readlines()
+         print data
+         print len(data)
+         time_end = time.time()
+         print (time_end-time_start)
+         return len(data)/(time_end-time_start)
+ 
++>>>>>>> remotes/gsathya/fix-utils.py
      def connect(self, bridge, timeout=None):
          if not timeout:
              if self.config.tests.tor_bridges_timeout:
                  self.timeout = self.config.tests.tor_bridges_timeout
              timeout = self.timeout
++<<<<<<< HEAD
 +        torrc, tordir, controlport = self.writetorrc(bridge)
++=======
+             #self.download_file()
+         torrc, tordir, controlport, socksport = self.writetorrc(bridge)
++>>>>>>> remotes/gsathya/fix-utils.py
          cmd = ["tor", "-f", torrc]
  
          tupdate = time.time()