Fixed problem showing touch zones

dtmilano · dtmilano · commit 240a26dde3a0 · 2015-08-18T12:19:30.000-04:00
- Version 10.7.2
diff --git a/.idea/AndroidViewClient.iml b/.idea/AndroidViewClient.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='10.7.1',
+    version='10.7.2',
     description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import sys
 import warnings
diff --git a/src/com/dtmilano/android/concertina.py b/src/com/dtmilano/android/concertina.py
@@ -25,7 +25,7 @@
 import time
 
 __author__ = 'diego'
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 DEBUG = True
 
diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py
@@ -19,7 +19,7 @@
     @author: Ahmed Kasem
     '''
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import sys, os
 import Tkinter, tkFileDialog, ttk
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -25,7 +25,7 @@
 from com.dtmilano.android.common import profileEnd
 from com.dtmilano.android.concertina import Concertina
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import sys
 import threading
@@ -1153,7 +1153,7 @@ def unmarkTarget(self, _id):
     def unmarkTargets(self):
         if not self.areTargetsMarked:
             return
-        for (_id, _) in self.markedTargetIds:
+        for _id in self.markedTargetIds:
             self.unmarkTarget(_id)
         self.markedTargetIds = {}
         self.areTargetsMarked = False
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -16,6 +16,8 @@
 
 DEBUG = True
 
+lock = threading.Lock()
+
 class RunTestsThread(threading.Thread):
     def __init__(self, group=None, target=None, name=None, args=(), kwargs=None, verbose=None, adbClient=None, testClass=None, testRunner=None):
         threading.Thread.__init__(self, group=group, target=target, name=name, verbose=verbose)
@@ -24,11 +26,18 @@ def __init__(self, group=None, target=None, name=None, args=(), kwargs=None, ver
         self.testRunner = testRunner
 
     def run(self):
+        lock.acquire()
+        pkg = re.sub('\.test$', '', self.testClass)
+        if DEBUG:
+            print >> sys.stderr, "Cleaning up before start. Stopping '%s'" % pkg
+        self.adbClient.shell('am force-stop ' + pkg)
+        time.sleep(3)
         if DEBUG:
             print >> sys.stderr, "Starting test..."
+        lock.release()
         out = self.adbClient.shell('am instrument -w ' + self.testClass + '/' + self.testRunner + '; echo "ERROR: $?"')
         if DEBUG:
-            print >> sys.stderr, "Finished test."
+            print >> sys.stderr, "\nFinished test."
         errmsg = out.splitlines()[-1]
         m = re.match('ERROR: (\d+)', errmsg)
         if m:
@@ -64,9 +73,11 @@ def __init__(self, adbclient, adb=None, localport=9999, remoteport=9999, hostnam
         self.__connectToServer(hostname, localport)
 
     def __connectToServer(self, hostname, port):
+        lock.acquire()
         self.conn = httplib.HTTPConnection(hostname, port)
         if not self.conn:
             raise RuntimeError("Cannot connect to %s:%d" % (hostname, port))
+        lock.release()
 
     def __whichAdb(self, adb):
         if adb:
@@ -91,31 +102,37 @@ def __runTests(self):
         # We need a new AdbClient instance with timeout=None (means, no timeout) for the long running test service
         newAdbClient = AdbClient(self.adbClient.serialno, self.adbClient.hostname, self.adbClient.port, timeout=None)
         self.thread = RunTestsThread(adbClient=newAdbClient, testClass=self.TEST_CLASS, testRunner=self.TEST_RUNNER)
+        if DEBUG:
+            print >> sys.stderr, "__runTests: starting thread"
         self.thread.start()
         if DEBUG:
             print >> sys.stderr, "__runTests: end"
 
 
     def __httpCommand(self, url, method='GET'):
         if self.isDarwin:
-            #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            #!! The connection cannot be resued in OSX, it gives:
-            #!!     response = conn.getresponse()
-            #!! File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 1045, in getresponse
-            #!!     response.begin()
-            #!!   File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 409, in begin
-            #!!     version, status, reason = self._read_status()
-            #!!   File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 373, in _read_status
-            #!!     raise BadStatusLine(line)
-            #!! httplib.BadStatusLine: ''
-            #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            # !! The connection cannot be resued in OSX, it gives:
+            # !!     response = conn.getresponse()
+            # !! File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 1045, in getresponse
+            # !!     response.begin()
+            # !!   File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 409, in begin
+            # !!     version, status, reason = self._read_status()
+            # !!   File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/httplib.py", line 373, in _read_status
+            # !!     raise BadStatusLine(line)
+            # !! httplib.BadStatusLine: ''
+            # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             self.__connectToServer(self.hostname, self.localPort)
             time.sleep(3)
         self.conn.request(method, url)
-        response = self.conn.getresponse()
-        if response.status == 200:
-            return response.read()
-        raise RuntimeError(response.status + " " + response.reason + " while " + method + " " + url)
+        try:
+            response = self.conn.getresponse()
+            if response.status == 200:
+                return response.read()
+            raise RuntimeError(response.status + " " + response.reason + " while " + method + " " + url)
+        except httplib.BadStatusLine, ex:
+            print >> sys.stderr, 'ERROR:', ex
+            return u''
 
     #
     # UiAutomatorHelper internal commands
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import sys
 import warnings
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import re
 import sys
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '10.7.1'
+__version__ = '10.7.2'
 
 import sys
 import os
