Merge lp:~soren/surveilr/bulksms into lp:surveilr

[Soren Hansen]

Add BulkSMS driver.

In the process, split the drivers into separate modules and turn
messaging.sms into a package.

Add BulkSMS driver.

In the process, split the drivers into separate modules and turn
messaging.sms into a package.

[Linux2Go Jenkins (linux2go-jenkins)]

The attempt to merge lp:~soren/surveilr/bulksms into lp:surveilr failed. Below is the output from the failed tests.

New python executable in .venv/bin/python
Installing distribute....................................................................................................................................................................................done.
Installing pip...............done.
Obtaining riak from git+git://github.com/basho/riak-python-client.git@master#egg=riak (from -r tools/pip-requirements.txt (line 1))
  Cloning git://github.com/basho/riak-python-client.git (to master) to ./.venv/src/riak
  Running setup.py egg_info for package riak

    warning: no files found matching 'erl_src/*'
Obtaining riakalchemy from git+git://github.com/Linux2Go/riakalchemy.git@master#egg=riakalchemy (from -r tools/pip-requirements.txt (line 2))
  Cloning git://github.com/Linux2Go/riakalchemy.git (to master) to ./.venv/src/riakalchemy
  Running setup.py egg_info for package riakalchemy

Downloading/unpacking nose (from -r tools/pip-requirements.txt (line 3))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fn%2Fnose%2Fnose-1.1.2.tar.gz
  Running setup.py egg_info for package nose

Downloading/unpacking routes (from -r tools/pip-requirements.txt (line 4))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FR%2FRoutes%2FRoutes-1.12.3.tar.gz
  Running setup.py egg_info for package routes

    warning: no previously-included files matching '.DS_Store' found anywhere in distribution
    warning: no previously-included files matching '*.hgignore' found anywhere in distribution
    warning: no previously-included files matching '*.hgtags' found anywhere in distribution
Downloading/unpacking webob (from -r tools/pip-requirements.txt (line 5))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FW%2FWebOb%2FWebOb-1.2b2.zip
  Running setup.py egg_info for package webob

    no previously-included directories found matching '*.pyc'
    no previously-included directories found matching '*.pyo'
Downloading/unpacking python-clickatell (from -r tools/pip-requirements.txt (line 6))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fp%2Fpython-clickatell%2Fpython-clickatell-0.1.3.tar.gz
  Running setup.py egg_info for package python-clickatell

Downloading/unpacking mock (from -r tools/pip-requirements.txt (line 7))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fm%2Fmock%2Fmock-0.7.2.zip
  Running setup.py egg_info for package mock

Downloading/unpacking eventlet (from -r tools/pip-requirements.txt (line 8))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fe%2Feventlet%2Feventlet-0.9.16.tar.gz
  Running setup.py egg_info for package eventlet

Downloading/unpacking httplib2 (from -r tools/pip-requirements.txt (line 9))
  Using download cache from /var/lib/jenkins/.pip/cache/http%3A%2F%2Fhttplib2...

[Soren Hansen (soren)]

Installed mercurial on Jenkins box.

=== modified file 'surveilr/defaults.cfg'
--- surveilr/defaults.cfg	2011-12-18 14:25:14 +0000
+++ surveilr/defaults.cfg	2011-12-20 11:09:28 +0000
@@ -1,6 +1,7 @@
 # This is where we stick defaults for various things
 
 [sms]
+driver = fake
 username =
 password =
 api_id =
 
=== added directory 'surveilr/messaging/sms'
=== renamed file 'surveilr/messaging/sms.py' => 'surveilr/messaging/sms/__init__.py'
--- surveilr/messaging/sms.py	2011-11-29 23:41:46 +0000
+++ surveilr/messaging/sms/__init__.py	2011-12-20 11:09:28 +0000
@@ -16,37 +16,22 @@
     You should have received a copy of the GNU Affero General Public
     License along with this program.  If not, see
     <http://www.gnu.org/licenses/>.
-
-    SMS messaging driver
 """
 
 from surveilr import config
 from surveilr import drivers
 
-from clickatell.api import Clickatell
-from clickatell import constants as cc
+import surveilr.messaging.sms.fake
+import surveilr.messaging.sms.clickatell_driver
+import surveilr.messaging.sms.bulksms_driver
 
 
 class SMSMessaging(object):
     def __init__(self):
-        username = config.get_str('sms', 'username')
-        password = config.get_str('sms', 'password')
-        api_id = config.get_str('sms', 'api_id')
-        self.client = Clickatell(username, password, api_id,
-                                 sendmsg_defaults={
-                                    'callback': cc.YES,
-                                    'msg_type': cc.SMS_DEFAULT,
-                                    'deliv_ack': cc.YES,
-                                    'req_feat': (cc.FEAT_ALPHA +
-                                                 cc.FEAT_NUMER +
-                                                 cc.FEAT_DELIVACK)
-                              })
+        driver_name = config.get_str('sms', 'driver')
+        self.driver = drivers.get_driver('sms', driver_name)
 
     def send(self, recipient, info):
-        sender = config.get_str('sms', 'sender')
-        self.client.sendmsg(recipients=[recipient.messaging_address],
-                            sender=sender,
-                            text=str(info))
-
+        return self.driver.send(recipient, info)
 
 drivers.register_driver('messaging', 'sms', SMSMessaging())
 
=== added file 'surveilr/messaging/sms/bulksms_driver.py'
--- surveilr/messaging/sms/bulksms_driver.py	1970-01-01 00:00:00 +0000
+++ surveilr/messaging/sms/bulksms_driver.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,47 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    BulkSMS driver
+"""
+from surveilr import config
+from surveilr import drivers
+
+import BulkSMS
+
+
+class BulkSMSMessaging(object):
+    def __init__(self):
+        username = config.get_str('sms', 'username')
+        password = config.get_str('sms', 'password')
+        kwargs = {}
+        try:
+            kwargs['server'] = config.get_str('sms', 'server')
+        except config.NoOptionError:
+            pass
+
+        self.client = BulkSMS.Server(username, password, **kwargs)
+
+    def send(self, recipient, info):
+        sender = config.get_str('sms', 'sender')
+        self.client.send_sms(recipients=[recipient.messaging_address],
+                             sender=sender,
+                             text=str(info))
+
+
+drivers.register_driver('sms', 'bulksms', BulkSMSMessaging())
 
=== added file 'surveilr/messaging/sms/clickatell_driver.py'
--- surveilr/messaging/sms/clickatell_driver.py	1970-01-01 00:00:00 +0000
+++ surveilr/messaging/sms/clickatell_driver.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,51 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Clickatell SMS driver
+"""
+from surveilr import config
+from surveilr import drivers
+
+from clickatell.api import Clickatell
+from clickatell import constants as cc
+
+
+class ClickatellMessaging(object):
+    def __init__(self):
+        username = config.get_str('sms', 'username')
+        password = config.get_str('sms', 'password')
+        api_id = config.get_str('sms', 'api_id')
+        self.client = Clickatell(username, password, api_id,
+                                 sendmsg_defaults={
+                                    'callback': cc.YES,
+                                    'msg_type': cc.SMS_DEFAULT,
+                                    'deliv_ack': cc.YES,
+                                    'req_feat': (cc.FEAT_ALPHA +
+                                                 cc.FEAT_NUMER +
+                                                 cc.FEAT_DELIVACK)
+                              })
+
+    def send(self, recipient, info):
+        sender = config.get_str('sms', 'sender')
+        self.client.sendmsg(recipients=[recipient.messaging_address],
+                            sender=sender,
+                            text=str(info))
+
+
+drivers.register_driver('sms', 'clickatell', ClickatellMessaging())
 
=== added file 'surveilr/messaging/sms/fake.py'
--- surveilr/messaging/sms/fake.py	1970-01-01 00:00:00 +0000
+++ surveilr/messaging/sms/fake.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,32 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Fake SMS driver
+"""
+
+from surveilr import drivers
+
+
+class FakeMessaging(object):
+    msgs = []
+
+    def send(self, recipient, info):
+        self.msgs.append((recipient, info))
+
+drivers.register_driver('sms', 'fake', FakeMessaging())
 
=== modified file 'surveilr/tests/__init__.py'
--- surveilr/tests/__init__.py	2011-11-30 09:32:31 +0000
+++ surveilr/tests/__init__.py	2011-12-20 11:09:28 +0000
@@ -20,6 +20,7 @@
 
 import mock
 import os.path
+import riakalchemy
 import unittest
 
 from surveilr import config
@@ -39,8 +40,13 @@
         return os.path.join(os.path.dirname(__file__),
                             os.path.pardir, 'defaults.cfg')
 
+    def set_cfg_value(self, section, option, value):
+        config.cfg.set(section, option, value)
+
     def setUp(self):
         super(TestCase, self).setUp()
+        riakalchemy.connect()
+
         with mock.patch('surveilr.config.defaults_file') as defaults_file:
             with mock.patch('surveilr.config.config_files') as config_files:
                 config_files.return_value = self.config_files()
 
=== modified file 'surveilr/tests/api/test_server.py'
--- surveilr/tests/api/test_server.py	2011-12-20 09:49:02 +0000
+++ surveilr/tests/api/test_server.py	2011-12-20 11:09:28 +0000
@@ -33,8 +33,7 @@
 
 class APIServerTests(tests.TestCase):
     def setUp(self):
-        import riakalchemy
-        riakalchemy.connect()
+        super(APIServerTests, self).setUp()
         self.application = SurveilrApplication({})
 
     def test_create_retrieve_user(self):
 
=== added directory 'surveilr/tests/messaging'
=== added file 'surveilr/tests/messaging/__init__.py'
--- surveilr/tests/messaging/__init__.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/__init__.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,19 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+"""
 
=== added directory 'surveilr/tests/messaging/sms'
=== added file 'surveilr/tests/messaging/sms/__init__.py'
--- surveilr/tests/messaging/sms/__init__.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/__init__.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,19 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+"""
 
=== added file 'surveilr/tests/messaging/sms/test_base.cfg'
--- surveilr/tests/messaging/sms/test_base.cfg	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/test_base.cfg	2011-12-20 11:09:28 +0000
@@ -0,0 +1,2 @@
+[sms]
+driver = not_your_average_sms_driver
 
=== added file 'surveilr/tests/messaging/sms/test_base.py'
--- surveilr/tests/messaging/sms/test_base.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/test_base.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,43 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+"""
+
+import mock
+
+from surveilr import tests
+from surveilr.messaging import sms
+
+
+class SMSMessagingTest(tests.TestCase):
+    @mock.patch('surveilr.messaging.sms.drivers')
+    def test_init(self, drivers):
+        sms.SMSMessaging()
+        drivers.get_driver.assert_called_with('sms',
+                                              'not_your_average_sms_driver')
+
+    @mock.patch('surveilr.messaging.sms.drivers')
+    def test_send(self, drivers):
+        drv = sms.SMSMessaging()
+        recipient = mock.sentinel.recipient
+        info = mock.sentinel.info
+
+        drv.send(recipient, info)
+
+        drivers.get_driver.return_value.send.assert_called_with(recipient,
+                                                                info)
 
=== added file 'surveilr/tests/messaging/sms/test_bulksms.cfg'
--- surveilr/tests/messaging/sms/test_bulksms.cfg	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/test_bulksms.cfg	2011-12-20 11:09:28 +0000
@@ -0,0 +1,6 @@
+[sms]
+driver = bulksms
+username = testuser
+password = testpassword
+api_id = testapiid
+sender = testsender
 
=== added file 'surveilr/tests/messaging/sms/test_bulksms.py'
--- surveilr/tests/messaging/sms/test_bulksms.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/test_bulksms.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,56 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Tests for BulkSMS driver
+"""
+
+import mock
+
+from surveilr import tests
+from surveilr.messaging.sms import bulksms_driver
+from surveilr.tests import utils
+
+
+class BulkSMSDriverTests(tests.TestCase):
+    @mock.patch('surveilr.messaging.sms.bulksms_driver.BulkSMS')
+    def test_instantiate_client(self, BulkSMS):
+        self.driver = bulksms_driver.BulkSMSMessaging()
+        BulkSMS.Server.assert_called_with('testuser', 'testpassword')
+
+    @mock.patch('surveilr.messaging.sms.bulksms_driver.BulkSMS')
+    def test_instantiate_client_override_server(self, BulkSMS):
+        self.set_cfg_value('sms', 'server', 'testserver')
+        self.driver = bulksms_driver.BulkSMSMessaging()
+        BulkSMS.Server.assert_called_with('testuser', 'testpassword',
+                                          server='testserver')
+
+    def test_send(self):
+        driver = bulksms_driver.BulkSMSMessaging()
+        driver.client = mock.Mock()
+
+        msisdn = '12345678'
+        user = utils.get_test_user(messaging_driver='sms',
+                                   messaging_address=msisdn)
+        info = utils.get_test_notification_info()
+
+        driver.send(user, info)
+
+        driver.client.send_sms.assert_called_with(recipients=[msisdn],
+                                                  sender='testsender',
+                                                  text=str(info))
 
=== renamed file 'surveilr/tests/test_messaging.cfg' => 'surveilr/tests/messaging/sms/test_clickatell.cfg'
--- surveilr/tests/test_messaging.cfg	2011-11-29 23:41:46 +0000
+++ surveilr/tests/messaging/sms/test_clickatell.cfg	2011-12-20 11:09:28 +0000
@@ -1,4 +1,5 @@
 [sms]
+driver = clickatell
 username = testuser
 password = testpassword
 api_id = testapiid
 
=== renamed file 'surveilr/tests/test_messaging.py' => 'surveilr/tests/messaging/sms/test_clickatell.py'
--- surveilr/tests/test_messaging.py	2011-12-20 09:49:02 +0000
+++ surveilr/tests/messaging/sms/test_clickatell.py	2011-12-20 11:09:28 +0000
@@ -17,38 +17,20 @@
     License along with this program.  If not, see
     <http://www.gnu.org/licenses/>.
 
-    Tests for messaging layer
+    Tests for Clickatell driver
 """
 
 import mock
 
-from surveilr import drivers
-from surveilr import messaging
 from surveilr import tests
-from surveilr.messaging import sms
+from surveilr.messaging.sms import clickatell_driver
 from surveilr.tests import utils
 
 
-class FakeMessagingDriverTests(tests.TestCase):
-    def setUp(self):
-        import surveilr.messaging.fake
-        # This does nothing, but pyflakes gets upset if we import it
-        # and never "use" it.
-        surveilr.messaging.fake
-        self.driver = drivers.get_driver('messaging', 'fake')
-
-    def test_send(self):
-        user = utils.get_test_user()
-        info = {'service': 'service_id',
-                'state': 'normal',
-                'previous_state': 'unexpected high'}
-        self.driver.send(user, info)
-
-
-class SMSMessagingDriverTests(tests.TestCase):
-    @mock.patch('surveilr.messaging.sms.Clickatell')
+class ClickatellDriverTests(tests.TestCase):
+    @mock.patch('surveilr.messaging.sms.clickatell_driver.Clickatell')
     def test_instantiate_client(self, clickatell):
-        self.driver = sms.SMSMessaging()
+        self.driver = clickatell_driver.ClickatellMessaging()
 
         sendmsg_defaults = {'callback': 1,
                             'req_feat': 8240,
@@ -58,7 +40,7 @@
                                       sendmsg_defaults=sendmsg_defaults)
 
     def test_send(self):
-        driver = sms.SMSMessaging()
+        driver = clickatell_driver.ClickatellMessaging()
         driver.client = mock.Mock()
 
         msisdn = '12345678'
@@ -71,43 +53,3 @@
         driver.client.sendmsg.assert_called_with(recipients=[msisdn],
                                                  sender='testsender',
                                                  text=str(info))
-
-
-class MessagingAPITests(tests.TestCase):
-    def test_send(self):
-        user = utils.get_test_user()
-        info = {'service': 'service_id',
-                'state': 'normal',
-                'previous_state': 'unexpected high'}
-
-        with mock.patch('surveilr.messaging._get_driver') as _get_driver:
-            messaging.send(user, info)
-
-            # Check that _get_driver gets called with the user as its argument
-            _get_driver.assert_called_with(user)
-
-            # Check that _get_driver's return value (i.e. the driver)
-            # gets its .send() method called with user and info as its
-            # arguments
-            _get_driver.return_value.send.assert_called_with(user, info)
-
-    def test_get_driver_default(self):
-        user = utils.get_test_user()
-        expected_driver = drivers.get_driver('messaging', 'fake')
-
-        actual_driver = messaging._get_driver(user)
-        self.assertEquals(actual_driver, expected_driver)
-
-    def test_get_driver_sms(self):
-        user = utils.get_test_user(messaging_driver='sms')
-        expected_driver = drivers.get_driver('messaging', 'sms')
-
-        actual_driver = messaging._get_driver(user)
-        self.assertEquals(actual_driver, expected_driver)
-
-    def test_get_driver_fake(self):
-        user = utils.get_test_user(messaging_driver='fake')
-        expected_driver = drivers.get_driver('messaging', 'fake')
-
-        actual_driver = messaging._get_driver(user)
-        self.assertEquals(actual_driver, expected_driver)
 
=== added file 'surveilr/tests/messaging/sms/test_fake.py'
--- surveilr/tests/messaging/sms/test_fake.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/sms/test_fake.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,39 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+"""
+
+import mock
+
+from surveilr import tests
+from surveilr.messaging.sms import fake
+
+
+class FakeSMSMessagingTest(tests.TestCase):
+    def test_send(self):
+        recipient1 = mock.sentinel.recipient1
+        info1 = mock.sentinel.info1
+        recipient2 = mock.sentinel.recipient2
+        info2 = mock.sentinel.info2
+
+        drv = fake.FakeMessaging()
+        drv.send(recipient1, info1)
+        drv.send(recipient2, info2)
+
+        self.assertEquals(drv.msgs, [(recipient1, info1),
+                                     (recipient2, info2)])
 
=== added file 'surveilr/tests/messaging/test_base.py'
--- surveilr/tests/messaging/test_base.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/test_base.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,68 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Tests for messaging layer
+"""
+
+import mock
+
+from surveilr import drivers
+from surveilr import messaging
+from surveilr import tests
+from surveilr.tests import utils
+
+
+class MessagingAPITests(tests.TestCase):
+    def test_send(self):
+        user = utils.get_test_user()
+        info = {'service': 'service_id',
+                'state': 'normal',
+                'previous_state': 'unexpected high'}
+
+        with mock.patch('surveilr.messaging._get_driver') as _get_driver:
+            messaging.send(user, info)
+
+            # Check that _get_driver gets called with the user as its argument
+            _get_driver.assert_called_with(user)
+
+            # Check that _get_driver's return value (i.e. the driver)
+            # gets its .send() method called with user and info as its
+            # arguments
+            _get_driver.return_value.send.assert_called_with(user, info)
+
+    def test_get_driver_default(self):
+        user = utils.get_test_user()
+        expected_driver = drivers.get_driver('messaging', 'fake')
+
+        actual_driver = messaging._get_driver(user)
+        self.assertEquals(actual_driver, expected_driver)
+
+    def test_get_driver_sms(self):
+        user = utils.get_test_user(messaging_driver='sms')
+        expected_driver = drivers.get_driver('messaging', 'sms')
+
+        actual_driver = messaging._get_driver(user)
+        self.assertEquals(actual_driver, expected_driver)
+
+    def test_get_driver_fake(self):
+        user = utils.get_test_user(messaging_driver='fake')
+        expected_driver = drivers.get_driver('messaging', 'fake')
+
+        actual_driver = messaging._get_driver(user)
+        self.assertEquals(actual_driver, expected_driver)
 
=== added file 'surveilr/tests/messaging/test_fake.py'
--- surveilr/tests/messaging/test_fake.py	1970-01-01 00:00:00 +0000
+++ surveilr/tests/messaging/test_fake.py	2011-12-20 11:09:28 +0000
@@ -0,0 +1,41 @@
+"""
+    Surveilr - Log aggregation, analysis and visualisation
+
+    Copyright (C) 2011  Linux2Go
+
+    This program is free software: you can redistribute it and/or
+    modify it under the terms of the GNU Affero General Public License
+    as published by the Free Software Foundation, either version 3 of
+    the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public
+    License along with this program.  If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Tests for fake messaging driver
+"""
+
+from surveilr import drivers
+from surveilr import tests
+from surveilr.tests import utils
+
+
+class FakeMessagingDriverTests(tests.TestCase):
+    def setUp(self):
+        import surveilr.messaging.fake
+        # This does nothing, but pyflakes gets upset if we import it
+        # and never "use" it.
+        surveilr.messaging.fake
+        self.driver = drivers.get_driver('messaging', 'fake')
+
+    def test_send(self):
+        user = utils.get_test_user()
+        info = {'service': 'service_id',
+                'state': 'normal',
+                'previous_state': 'unexpected high'}
+        self.driver.send(user, info)
 
=== modified file 'surveilr/tests/test_config.py'
--- surveilr/tests/test_config.py	2011-12-19 23:16:11 +0000
+++ surveilr/tests/test_config.py	2011-12-20 11:09:28 +0000
@@ -25,6 +25,7 @@
 
 import os.path
 
+
 class ConfigTest(tests.TestCase):
     def defaults_file(self):
         return os.path.join(os.path.dirname(__file__),
 
=== modified file 'tools/pip-requirements.txt'
--- tools/pip-requirements.txt	2011-12-18 14:25:14 +0000
+++ tools/pip-requirements.txt	2011-12-20 11:09:28 +0000
@@ -12,3 +12,4 @@
 pastedeploy
 paste
 PasteScript
+-e hg+https://code.google.com/p/soren-bulksms/#egg=BulkSMS