Improved tests

- Avoid server.serve_forever(1) (blocks on Linux)

Author: dtmilano

AndroidViewClient/.pydevproject

@@ -2,8 +2,8 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">monkeyrunner</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/AndroidViewClient/src</path>
 <path>/AndroidViewClient/examples</path>

AndroidViewClient/tests/com/dtmilano/android/mocks.py

@@ -661,8 +661,6 @@ def __init__(self, serialno="MOCK12345678", version=15, startviewserver=False, u
                 print >> sys.stderr, "\n**** Starting ViewServer... ****", self
             self.viewServer = MockViewServer()
         else:
-            if DEBUG:
-                print >> sys.stderr, "\n**** Not Starting ViewServer... ****"
             self.viewServer = None
         self.uiAutomatorKilled = uiautomatorkilled
         self.language = language
@@ -767,12 +765,16 @@ def run(self):
                 print >> sys.stderr, "ServerThread: serving running=", self.running
             # In 2.5 serve_forever() never exits and there's no way of stopping the server
             #self.server.serve_forever(self.pollInterval)
-#             while self.running:
-#                 if DEBUG:
-#                     print >> sys.stderr, "ServerThread: polling (self=%s)" % self
-#                 r, w, e = select([self.server], [], [], self.pollInterval)
-#                 if r:
-#                         self.server.handle_request()
+            while self.running:
+                if DEBUG:
+                    print >> sys.stderr, "ServerThread: polling (self=%s)" % self
+                r, w, e = select.select([self.server], [], [], self.pollInterval)
+                if r:
+                    if self.server:
+                        try:
+                            self.server.handle_request()
+                        except:
+                            print >> sys.stderr, "ServerThread: the socket may have been closed"
 
 
     def __init__(self, host=HOST, port=PORT):
@@ -784,30 +786,30 @@ def __init__(self, host=HOST, port=PORT):
         self.host = host
         self.port = port
         # In 2.5 serve_forever() never exits and there's no way of stopping the server
-        self.server.serve_forever(1)
-
+        #self.server.serve_forever(1)
+        #print >> sys.stderr, "MockViewServer: NEVER REACHED on Linux"
         # Activate the server; this will keep running until you shutdown
-        #self.serverThread = MockViewServer.ServerThread(self.server)
-        #self.serverThread.start()
+        self.serverThread = MockViewServer.ServerThread(self.server)
+        self.serverThread.start()
 
     def shutdown(self):
         if DEBUG:
             print >> sys.stderr, "**** MockViewServer.shutdown() ****"
         try:
-            #self.server.socket.shutdown(socket.SHUT_RDWR)
-            if DEBUG:
-                print >> sys.stderr, "    shutdown: shutting down the server, serve_forever() should exit"
-            self.server.shutdown()
+            self.server.socket.shutdown(socket.SHUT_RDWR)
+            #if DEBUG:
+            #    print >> sys.stderr, "    shutdown: shutting down the server, serve_forever() should exit"
+            #self.server.shutdown()
             if DEBUG:
                 print >> sys.stderr, "    shutdown: DONE"
         except Exception, ex:
             print >> sys.stderr, "ERROR", ex
             pass
         self.serverThread.running = False
-#         #self.server.socket.shutdown(socket.SHUT_RDWR)
-#         self.server.socket.close()
+        #self.server.socket.shutdown(socket.SHUT_RDWR)
+        self.server.socket.close()
 #        del(self.server.socket)
         #del(self.server)
-        #time.sleep(120)
-        #time.sleep(5)
+        time.sleep(120)
+        time.sleep(5)
 

AndroidViewClient/tests/com/dtmilano/android/viewclient.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env monkeyrunner
+#! /usr/bin/env python
 # -*- coding: utf-8 -*-
 '''
 Copyright (C) 2012  Diego Torres Milano
@@ -13,6 +13,7 @@
 import StringIO
 import unittest
 import exceptions
+import platform
 
 # PyDev sets PYTHONPATH, use it
 try:
@@ -31,10 +32,7 @@
 from mocks import MockDevice, MockViewServer
 from mocks import DUMP, DUMP_SAMPLE_UI, VIEW_MAP, VIEW_MAP_API_8, VIEW_MAP_API_17, RUNNING, STOPPED, WINDOWS
 
-# this is probably the only reliable way of determining the OS in monkeyrunner
-# FIXME:
-#os_name = java.lang.System.getProperty('os.name')
-os_name = os.name
+os_name = platform.system()
 if os_name.startswith('Linux'):
     TRUE = '/bin/true'
 else:
@@ -928,7 +926,10 @@ def testUiAutomatorDump(self):
 
     def testUiAutomatorKilled(self):
         device = MockDevice(version=16, uiautomatorkilled=True)
-        vc = ViewClient(device, device.serialno, adb=TRUE, autodump=True, ignoreuiautomatorkilled=True)
+        try:
+            vc = ViewClient(device, device.serialno, adb=TRUE, autodump=True, ignoreuiautomatorkilled=True)
+        except Exception, e:
+            self.assertIsNotNone(re.search('''ERROR: UiAutomator output contains no valid information. UiAutomator was killed, no reason given.''', str(e)))
 
     def testUiViewServerDump(self):
         device = None