Private timeout handler

dtmilano · dtmilano · commit 8bc2adf38da6 · 2018-04-27T23:53:15.000-04:00
- Improved test
diff --git a/docs/com.dtmilano.android.adb.adbclient.AdbClient-class.html b/docs/com.dtmilano.android.adb.adbclient.AdbClient-class.html
@@ -137,10 +137,10 @@ <h1 class="epydoc">Class AdbClient</h1><p class="nomargin-top"><span class="code
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a name="timeoutHandler"></a><span class="summary-sig-name">timeoutHandler</span>(<span class="summary-sig-arg">self</span>,
+          <td><span class="summary-sig"><a name="__timeoutHandler"></a><span class="summary-sig-name">__timeoutHandler</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">timerId</span>)</span></td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="com.dtmilano.android.adb.adbclient-pysrc.html#AdbClient.timeoutHandler">source&nbsp;code</a></span>
+            <span class="codelink"><a href="com.dtmilano.android.adb.adbclient-pysrc.html#AdbClient.__timeoutHandler">source&nbsp;code</a></span>
             
           </td>
         </tr>
diff --git a/docs/identifier-index.html b/docs/identifier-index.html
@@ -1930,7 +1930,7 @@ <h1 class="epydoc">Identifier Index</h1>
 <span class="index-where">(in&nbsp;<a href="com.dtmilano.android.viewclient.EditText-class.html">EditText</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="com.dtmilano.android.adb.adbclient.AdbClient-class.html#timeoutHandler">timeoutHandler()</a><br />
+<td width="33%" class="link-index"><a href="com.dtmilano.android.adb.adbclient.AdbClient-class.html#__timeoutHandler">__timeoutHandler()</a><br />
 <span class="index-where">(in&nbsp;<a href="com.dtmilano.android.adb.adbclient.AdbClient-class.html">AdbClient</a>)</span></td>
 <td width="33%" class="link-index"><a href="com.dtmilano.android.culebron.Operation-class.html#TOUCH_POINT">TOUCH_POINT</a><br />
 <span class="index-where">(in&nbsp;<a href="com.dtmilano.android.culebron.Operation-class.html">Operation</a>)</span></td>
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -198,7 +198,7 @@ def __init__(self, serialno=None, hostname=HOSTNAME, port=PORT, settransport=Tru
             self.build[VERSION_SDK_PROPERTY] = int(self.__getProp(VERSION_SDK_PROPERTY))
             self.initDisplayProperties()
 
-    def timeoutHandler(self, timerId, description=None):
+    def __timeoutHandler(self, timerId, description=None):
         if DEBUG:
             print >> sys.stderr, "\nTIMEOUT HANDLER", timerId, ':', description
         self.timers[timerId] = "EXPIRED"
@@ -213,7 +213,7 @@ def setTimer(self, timeout, description=None):
         :return: the timerId
         """
         self.timerId += 1
-        timer = Timer(timeout, self.timeoutHandler, (self.timerId, description))
+        timer = Timer(timeout, self.__timeoutHandler, (self.timerId, description))
         timer.start()
         self.timers[self.timerId] = timer
         return self.timerId
diff --git a/tests/com/dtmilano/android/viewclient_with_real_devices_connected.py b/tests/com/dtmilano/android/viewclient_with_real_devices_connected.py
@@ -40,12 +40,11 @@ def setUpClass(cls):
            - emulator-5554
            - emulator-5556
         '''
-        print >> sys.stderr, "path = ", sys.path
         if ViewClientTest.CONNECT_EMULATORS:
-            sys.argv = ['testViewClient_localPort_remotePort', ViewClientTest.serialno1]
+            sys.argv = ['testViewClient_localPort_remotePort', cls.serialno1]
             cls.device1, cls.serialno1 = ViewClient.connectToDeviceOrExit(timeout=30)
 
-            sys.argv = ['testViewClient_localPort_remotePort', ViewClientTest.serialno2]
+            sys.argv = ['testViewClient_localPort_remotePort', cls.serialno2]
             cls.device2, cls.serialno2 = ViewClient.connectToDeviceOrExit(timeout=30)
 
     def setUp(self):
@@ -101,6 +100,7 @@ def testViewClient_oneDevice_TwoViewClients(self):
 
     def testViewClient_device_disconnected(self):
         # Script gets stuck on ViewClient(device, serial) #243
+        # This cannot run on emulator because we have to disconnect the USB or network
         d, s = ViewClient.connectToDeviceOrExit()
         self.assertIsNotNone(d)
         self.assertIsNotNone(s)
