Fixed broken tests

celery/beat.py

@@ -153,7 +153,7 @@ class Scheduler(UserDict):
             try:
                 result = self.apply_async(entry, publisher=publisher)
             except Exception, exc:
-                self.logger.error("Message Error:\n%s" % (exc,
+                self.logger.error("Message Error: %s\n%s" % (exc,
                     traceback.format_stack()))
             else:
                 self.logger.debug("%s sent. id->%s" % (entry.task,

celery/tests/test_bin/test_celerybeat.py

@@ -47,10 +47,6 @@ class test_Beat(unittest.TestCase):
         b = beatapp.Beat()
         b.init_loader()
 
-    def test_startup_info(self):
-        b = beatapp.Beat()
-        self.assertIn("@stderr", b.startup_info())
-
     def test_process_title(self):
         b = beatapp.Beat()
         b.set_process_title()

celery/tests/test_task_control.py

@@ -102,11 +102,6 @@ class test_inspect(unittest.TestCase):
         self.i.disable_events()
         self.assertIn("disable_events", MockBroadcastPublisher.sent)
 
-    @with_mock_broadcast
-    def test_diagnose(self):
-        self.i.diagnose()
-        self.assertIn("diagnose", MockBroadcastPublisher.sent)
-
     @with_mock_broadcast
     def test_ping(self):
         self.i.ping()