Merge lp:~bigkevmcd/offspring/bug-1039135-fix-notifications into lp:offspring

[Kevin McDermott]

Test and fix for this bug.

[Cody A.W. Somerville (cody-somerville)]

Looks good. Thanks for tackling this so quickly Kevin - much appreciated!

review: Approve

=== modified file 'lib/offspring/master/master.py'
--- lib/offspring/master/master.py	2012-04-10 10:18:46 +0000
+++ lib/offspring/master/master.py	2012-08-21 13:40:24 +0000
@@ -66,6 +66,7 @@
                     "Uncaught error propagated to main execution loop.")
                 notifications.notify_crash(
                     "Lexbuilder Master (Build Queue Dispatcher)",
+                     self.config,
                      mailer=self.mailer)
                 logging.error(
                     "SHUTTING DOWN: Fatal error has occurred.")

=== modified file 'lib/offspring/master/tests/test_master.py'
--- lib/offspring/master/tests/test_master.py	2012-04-10 10:18:46 +0000
+++ lib/offspring/master/tests/test_master.py	2012-08-21 13:40:24 +0000
@@ -368,3 +368,37 @@
                 "name": self.project.name, "priority": self.project.priority,
                 "builder": builder1.name},
             log_file.getvalue())
+
+
+    def test_run_dispatches_errors_correctly(self):
+        """
+        If an error is triggered during the master run, it should call
+        notification successfully.
+        """
+        log_file = self.capture_logging(log_level=logging.DEBUG)
+        sleep_mock = self.mocker.replace("time.sleep")
+        sleep_mock(20)
+        sys_exit_mock = self.mocker.replace("sys.exit")
+        sys_exit_mock(1)
+
+        self.config.set("master", "poll_frequency", "20")
+        master = self.get_master()
+        mock_master = self.mocker.patch(master)
+        mock_master.scanSlaves()
+        self.mocker.throw(ValueError("Just a Test"))
+
+        # We need to set the value of "self.is_online" so that it will run only
+        # once.
+        mock_master.is_online
+        self.mocker.result(True)
+        mock_master.is_online
+        self.mocker.result(False)
+
+        self.mocker.replay()
+        master.run()
+        self.assertEqual(('Lexbuilder Master (Build Queue Dispatcher) <[e-mail]>',
+                          '[e-mail]'),
+                         self.mailer.mails[0][0:2])
+        log = log_file.getvalue()
+        self.assertTrue("SHUTTING DOWN: Fatal error has occurred." in log,
+                        "Master didn't shutdown on fatal error.")