From fcea42586613ce31aebe1a6764b91bef86bc6f66 Mon Sep 17 00:00:00 2001
From: Scott Petersen <scott@nutech.com>
Date: Tue, 23 Feb 2016 11:23:53 -0800
Subject: [PATCH] Updated tests for use of select.select and the changed
 ZoneTracking constructor.

---
 test/test_devices.py      | 55 +++++++++++++++++++++++----------------
 test/test_zonetracking.py |  7 ++++-
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/test/test_devices.py b/test/test_devices.py
index 628927a..05c33d5 100644
--- a/test/test_devices.py
+++ b/test/test_devices.py
@@ -7,6 +7,7 @@ import socket
 import time
 import tempfile
 import os
+import select
 from OpenSSL import SSL, crypto
 from alarmdecoder.devices import USBDevice, SerialDevice, SocketDevice
 from alarmdecoder.util import NoDeviceError, CommError, TimeoutError
@@ -292,40 +293,50 @@ class TestSocketDevice(TestCase):
             with patch.object(socket.socket, 'connect', return_value=None):
                 self._device.open(no_reader_thread=True)
 
-            with patch.object(socket.socket, 'recv') as mock:
-                self._device.read()
+            with patch('socket.socket.fileno', return_value=1):
+                with patch.object(select, 'select', return_value=[[1], [], []]):
+                    with patch.object(socket.socket, 'recv') as mock:
+                        self._device.read()
 
             mock.assert_called_with(1)
 
     def test_read_exception(self):
-        with patch.object(self._device._device, 'recv', side_effect=socket.error):
-            with self.assertRaises(CommError):
-                self._device.read()
+        with patch('socket.socket.fileno', return_value=1):
+            with patch.object(select, 'select', return_value=[[1], [], []]):
+                with patch.object(self._device._device, 'recv', side_effect=socket.error):
+                    with self.assertRaises(CommError):
+                        self._device.read()
 
     def test_read_line(self):
-        with patch.object(self._device._device, 'recv', side_effect=list("testing\r\n")):
-            ret = None
-            try:
-                ret = self._device.read_line()
-            except StopIteration:
-                pass
+        with patch('socket.socket.fileno', return_value=1):
+            with patch.object(select, 'select', return_value=[[1], [], []]):
+                with patch.object(self._device._device, 'recv', side_effect=list("testing\r\n")):
+                    ret = None
+                    try:
+                        ret = self._device.read_line()
+                    except StopIteration:
+                        pass
 
-            self.assertEquals(ret, "testing")
+                    self.assertEquals(ret, "testing")
 
     def test_read_line_timeout(self):
-        with patch.object(self._device._device, 'recv', return_value='a') as mock:
-            with self.assertRaises(TimeoutError):
-                self._device.read_line(timeout=0.1)
+        with patch('socket.socket.fileno', return_value=1):
+            with patch.object(select, 'select', return_value=[[1], [], []]):
+                with patch.object(self._device._device, 'recv', return_value='a') as mock:
+                    with self.assertRaises(TimeoutError):
+                        self._device.read_line(timeout=0.1)
 
-        self.assertIn('a', self._device._buffer)
+                        self.assertIn('a', self._device._buffer)
 
     def test_read_line_exception(self):
-        with patch.object(self._device._device, 'recv', side_effect=socket.error):
-            with self.assertRaises(CommError):
-                self._device.read_line()
-
-            with self.assertRaises(CommError):
-                self._device.read_line()
+        with patch('socket.socket.fileno', return_value=1):
+            with patch.object(select, 'select', return_value=[[1], [], []]):
+                with patch.object(self._device._device, 'recv', side_effect=socket.error):
+                    with self.assertRaises(CommError):
+                        self._device.read_line()
+
+                    with self.assertRaises(CommError):
+                        self._device.read_line()
 
     def test_ssl(self):
         ssl_key = crypto.PKey()
diff --git a/test/test_zonetracking.py b/test/test_zonetracking.py
index 7c2c901..a20a3df 100644
--- a/test/test_zonetracking.py
+++ b/test/test_zonetracking.py
@@ -1,13 +1,18 @@
 from unittest import TestCase
 from mock import Mock, MagicMock
 
+from alarmdecoder import AlarmDecoder
+from alarmdecoder.panels import ADEMCO
 from alarmdecoder.messages import Message, ExpanderMessage
 from alarmdecoder.zonetracking import Zonetracker, Zone
 
 
 class TestZonetracking(TestCase):
     def setUp(self):
-        self._zonetracker = Zonetracker()
+        self._alarmdecoder = Mock(spec=AlarmDecoder)
+
+        self._alarmdecoder.mode = ADEMCO
+        self._zonetracker = Zonetracker(self._alarmdecoder)
 
         self._zonetracker.on_fault += self.fault_event
         self._zonetracker.on_restore += self.restore_event