Merge lp:~robertcarr/mir/socket-messenger-reporting into lp:mir

[Robert Carr]

Add messenger report and report socket messenger write errors.

Report socket messenger write errors so we can keep track of this.

[Alan Griffiths (alan-griffiths)]

[ try]
9 {
50 ba::write(*socket, ba::buffer(whole_message));
51 }
52 - catch (std::exception &)
53 + catch (std::exception &ex)
54 {
55 - // Don't care
56 + report->error(ex);
57 }

This is better written as:

    boost::system::error_code ec;
    ba::write(*socket, ba::buffer(whole_message), ec);

    if (!ec)
    {
        report->error(ec.message());
    }

And not throwing and catching exceptions.

review: Needs Fixing

[Robert Carr (robertcarr)]

Fixed to use the error code, updating to trunk with the reorganization of some frontend interfaces (notably communicator_report->connector_report) made it necessary to introduce a new reporting interface. messenger_report

[Robert Carr (robertcarr)]

Branch confusion....

[Alan Griffiths (alan-griffiths)]

418 + if (!err)

Sorry, my typo - there should be no "!"! (Shouldn't a test detect this is wrong?)

And what is the deal with debian/changelog?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1076
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robertcarr/mir/socket-messenger-reporting/+merge/187822/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/38/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/mir/socket-messenger-reporting]

1077. By Robert Carr on 2013-09-26

Merge development branch

Unmerged revisions

1077. By Robert Carr on 2013-09-26

Merge development branch

1076. By Robert Carr on 2013-09-26

Update tests

1075. By Robert Carr on 2013-09-26

Merge trunk and update to new frontend interfaces

1074. By Robert Carr on 2013-09-23

Typo

1073. By Robert Carr on 2013-09-23

socket_messenger: Report exceptions

1072. By Daniel van Vugt on 2013-09-20

Stop asio::write from throwing exceptions (SIGPIPE). It will only do so
after we've closed the socket, at which point we don't really care.
(LP: #1226139)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-26 02:41:07 +0000
+++ debian/changelog	2013-09-26 19:15:16 +0000
@@ -1,4 +1,4 @@
-mir (0.0.12-0ubuntu1) UNRELEASED; urgency=low
+mir (0.0.12+13.10.20130926.1-0ubuntu1) saucy; urgency=low
 
   [ kg ]
   * bump version for ABI break (LP: #1229212)
@@ -6,7 +6,13 @@
   [ Robert Ancell ]
   * Bump version to 0.0.12
 
- -- Robert Ancell <[e-mail]>  Thu, 26 Sep 2013 09:34:23 +1200
+  [ Alexandros Frantzis ]
+  * tests: Fix compiler warning about maybe-uninitialized struct member
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 1084
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 26 Sep 2013 08:39:29 +0000
 
 mir (0.0.11+13.10.20130924.1-0ubuntu1) saucy; urgency=low
 
 
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-09-24 11:43:27 +0000
+++ include/server/mir/default_server_configuration.h	2013-09-26 19:15:16 +0000
@@ -46,6 +46,7 @@
 class SessionCreator;
 class SessionMediatorReport;
 class MessageProcessorReport;
+class MessengerReport;
 class SessionAuthorizer;
 class EventSink;
 class DisplayChanger;
@@ -165,6 +166,7 @@
      *  @{ */
     virtual std::shared_ptr<frontend::SessionMediatorReport>  the_session_mediator_report();
     virtual std::shared_ptr<frontend::MessageProcessorReport> the_message_processor_report();
+    virtual std::shared_ptr<frontend::MessengerReport>        the_messenger_report();
     virtual std::shared_ptr<frontend::SessionAuthorizer>      the_session_authorizer();
     virtual std::shared_ptr<frontend::Shell>                  the_frontend_shell();
     virtual std::shared_ptr<frontend::EventSink>              the_global_event_sink();
@@ -270,6 +272,7 @@
     CachedPtr<frontend::ProtobufIpcFactory>  ipc_factory;
     CachedPtr<frontend::SessionMediatorReport> session_mediator_report;
     CachedPtr<frontend::MessageProcessorReport> message_processor_report;
+    CachedPtr<frontend::MessengerReport> messenger_report;
     CachedPtr<frontend::SessionAuthorizer> session_authorizer;
     CachedPtr<frontend::EventSink> global_event_sink;
     CachedPtr<frontend::SessionCreator>    session_creator;
 
=== modified file 'include/server/mir/frontend/connector_report.h'
--- include/server/mir/frontend/connector_report.h	2013-09-24 16:20:17 +0000
+++ include/server/mir/frontend/connector_report.h	2013-09-26 19:15:16 +0000
@@ -42,7 +42,6 @@
 class NullConnectorReport : public ConnectorReport
 {
 public:
-
     void error(std::exception const& error);
 };
 }
 
=== added file 'include/server/mir/frontend/messenger_report.h'
--- include/server/mir/frontend/messenger_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/frontend/messenger_report.h	2013-09-26 19:15:16 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#ifndef MIR_FRONTEND_MESSENGER_REPORT_H_
+#define MIR_FRONTEND_MESSENGER_REPORT_H_
+
+#include <string>
+
+namespace mir
+{
+namespace frontend
+{
+
+class MessengerReport
+{
+public:
+    virtual void error(std::string const& error_message) = 0;
+
+protected:
+    virtual ~MessengerReport() = default;
+    MessengerReport() = default;
+    MessengerReport(const MessengerReport&) = delete;
+    MessengerReport& operator=(const MessengerReport&) = delete;
+};
+
+class NullMessengerReport : public MessengerReport
+{
+public:
+    void error(std::string const& error_message);
+};
+}
+}
+
+#endif // MIR_FRONTEND_MESSENGER_REPORT_H_
 
=== modified file 'include/server/mir/frontend/protobuf_ipc_factory.h'
--- include/server/mir/frontend/protobuf_ipc_factory.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/frontend/protobuf_ipc_factory.h	2013-09-26 19:15:16 +0000
@@ -32,6 +32,7 @@
 class EventSink;
 class ResourceCache;
 class MessageProcessorReport;
+class MessengerReport;
 
 class ProtobufIpcFactory
 {
@@ -39,7 +40,8 @@
     virtual std::shared_ptr<protobuf::DisplayServer> make_ipc_server(
         std::shared_ptr<EventSink> const& sink, bool authorized_to_resize_display) = 0;
     virtual std::shared_ptr<ResourceCache> resource_cache() = 0;
-    virtual std::shared_ptr<MessageProcessorReport> report() = 0;
+    virtual std::shared_ptr<MessageProcessorReport> message_processor_report() = 0;
+    virtual std::shared_ptr<MessengerReport> messenger_report() = 0;
 
 protected:
     ProtobufIpcFactory() {}
 
=== added file 'include/server/mir/logging/messenger_report.h'
--- include/server/mir/logging/messenger_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/logging/messenger_report.h	2013-09-26 19:15:16 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_LOGGING_MESSENGER_REPORT_H_
+#define MIR_LOGGING_MESSENGER_REPORT_H_
+
+#include "mir/frontend/messenger_report.h"
+
+#include <memory>
+
+namespace mir
+{
+namespace logging
+{
+class Logger;
+
+class MessengerReport : public frontend::MessengerReport
+{
+public:
+    MessengerReport(std::shared_ptr<Logger> const& logger);
+    virtual ~MessengerReport() noexcept(true) = default;
+    
+    void error(std::string const& error_message);
+    
+private:
+    char const* component();
+    std::shared_ptr<Logger> const logger;
+};
+
+}
+}
+
+
+#endif /* MIR_LOGGING_MESSENGER_REPORT_H_ */
 
=== modified file 'include/test/mir_test_doubles/stub_ipc_factory.h'
--- include/test/mir_test_doubles/stub_ipc_factory.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/stub_ipc_factory.h	2013-09-26 19:15:16 +0000
@@ -24,6 +24,7 @@
 #include "mir/frontend/protobuf_ipc_factory.h"
 #include "mir/frontend/resource_cache.h"
 #include "mir/frontend/null_message_processor_report.h"
+#include "mir/frontend/messenger_report.h"
 
 namespace mir
 {
@@ -53,10 +54,14 @@
         return cache;
     }
 
-    virtual std::shared_ptr<frontend::MessageProcessorReport> report()
+    virtual std::shared_ptr<frontend::MessageProcessorReport> message_processor_report()
     {
         return std::make_shared<frontend::NullMessageProcessorReport>();
     }
+    virtual std::shared_ptr<frontend::MessengerReport> messenger_report()
+    {
+        return std::make_shared<frontend::NullMessengerReport>();
+    }
 
     std::shared_ptr<protobuf::DisplayServer> server;
     std::shared_ptr<frontend::ResourceCache> const cache;
 
=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-09-24 17:25:47 +0000
+++ src/server/default_server_configuration.cpp	2013-09-26 19:15:16 +0000
@@ -30,6 +30,7 @@
 #include "mir/frontend/protobuf_ipc_factory.h"
 #include "mir/frontend/session_mediator_report.h"
 #include "mir/frontend/null_message_processor_report.h"
+#include "mir/frontend/messenger_report.h"
 #include "mir/frontend/session_mediator.h"
 #include "mir/frontend/session_authorizer.h"
 #include "mir/frontend/global_event_sender.h"
@@ -75,6 +76,7 @@
 #include "mir/logging/session_mediator_report.h"
 #include "mir/logging/message_processor_report.h"
 #include "mir/logging/display_report.h"
+#include "mir/logging/messenger_report.h"
 #include "mir/lttng/message_processor_report.h"
 #include "mir/lttng/input_report.h"
 #include "mir/shell/surface_source.h"
@@ -113,13 +115,15 @@
     explicit DefaultIpcFactory(
         std::shared_ptr<mf::Shell> const& shell,
         std::shared_ptr<mf::SessionMediatorReport> const& sm_report,
-        std::shared_ptr<mf::MessageProcessorReport> const& mr_report,
+        std::shared_ptr<mf::MessageProcessorReport> const& mp_report,
+        std::shared_ptr<mf::MessengerReport> const& messenger_report,
         std::shared_ptr<mg::Platform> const& graphics_platform,
         std::shared_ptr<mf::DisplayChanger> const& display_changer,
         std::shared_ptr<mg::GraphicBufferAllocator> const& buffer_allocator) :
         shell(shell),
         sm_report(sm_report),
-        mp_report(mr_report),
+        mp_report(mp_report),
+        msger_report(messenger_report),
         cache(std::make_shared<mf::ResourceCache>()),
         graphics_platform(graphics_platform),
         display_changer(display_changer),
@@ -131,6 +135,7 @@
     std::shared_ptr<mf::Shell> shell;
     std::shared_ptr<mf::SessionMediatorReport> const sm_report;
     std::shared_ptr<mf::MessageProcessorReport> const mp_report;
+    std::shared_ptr<mf::MessengerReport> const msger_report;
     std::shared_ptr<mf::ResourceCache> const cache;
     std::shared_ptr<mg::Platform> const graphics_platform;
     std::shared_ptr<mf::DisplayChanger> const display_changer;
@@ -164,16 +169,21 @@
         return cache;
     }
 
-    virtual std::shared_ptr<mf::MessageProcessorReport> report()
+    virtual std::shared_ptr<mf::MessageProcessorReport> message_processor_report()
     {
         return mp_report;
     }
+    virtual std::shared_ptr<mf::MessengerReport> messenger_report()
+    {
+        return msger_report;
+    }
 };
 
 char const* const server_socket_opt           = "file";
 char const* const no_server_socket_opt        = "no-file";
 char const* const session_mediator_report_opt = "session-mediator-report";
 char const* const msg_processor_report_opt    = "msg-processor-report";
+char const* const messenger_report_opt        = "messenger-report";
 char const* const display_report_opt          = "display-report";
 char const* const legacy_input_report_opt     = "legacy-input-report";
 char const* const input_report_opt            = "input-report";
@@ -824,6 +834,7 @@
                 shell,
                 the_session_mediator_report(),
                 the_message_processor_report(),
+                the_messenger_report(),
                 the_graphics_platform(),
                 the_frontend_display_changer(), allocator);
         });
@@ -890,6 +901,23 @@
         });
 }
 
+std::shared_ptr<mf::MessengerReport>
+mir::DefaultServerConfiguration::the_messenger_report()
+{
+    return messenger_report(
+        [this]() -> std::shared_ptr<mf::MessengerReport>
+        {
+            auto report_opt = the_options()->get(messenger_report_opt, off_opt_value);
+            if (report_opt == log_opt_value)
+            {
+                return std::make_shared<ml::MessengerReport>(the_logger());
+            }
+            else
+            {
+                return std::make_shared<mf::NullMessengerReport>();
+            }
+        });
+}
 
 std::shared_ptr<ml::Logger> mir::DefaultServerConfiguration::the_logger()
 {
 
=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2013-09-24 13:27:33 +0000
+++ src/server/frontend/CMakeLists.txt	2013-09-26 19:15:16 +0000
@@ -5,6 +5,7 @@
   session_mediator.cpp
   null_session_mediator_report.cpp
   null_message_processor_report.cpp
+  null_messenger_report.cpp
   protobuf_message_processor.cpp
   protobuf_buffer_packer.cpp
   null_message_processor.cpp
 
=== added file 'src/server/frontend/null_messenger_report.cpp'
--- src/server/frontend/null_messenger_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/frontend/null_messenger_report.cpp	2013-09-26 19:15:16 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#include "mir/frontend/messenger_report.h"
+
+namespace mf = mir::frontend;
+
+void mf::NullMessengerReport::error(std::string const&)
+{
+}
 
=== modified file 'src/server/frontend/protobuf_session_creator.cpp'
--- src/server/frontend/protobuf_session_creator.cpp	2013-09-24 13:27:33 +0000
+++ src/server/frontend/protobuf_session_creator.cpp	2013-09-26 19:15:16 +0000
@@ -53,7 +53,7 @@
 
 void mf::ProtobufSessionCreator::create_session_for(std::shared_ptr<ba::local::stream_protocol::socket> const& socket)
 {
-    auto const messenger = std::make_shared<detail::SocketMessenger>(socket);
+    auto const messenger = std::make_shared<detail::SocketMessenger>(socket, ipc_factory->messenger_report());
     auto const client_pid = messenger->client_pid();
 
     if (session_authorizer->connection_is_allowed(client_pid))
@@ -64,7 +64,7 @@
             messenger,
             ipc_factory->make_ipc_server(event_sink, authorized_to_resize_display),
             ipc_factory->resource_cache(),
-            ipc_factory->report());
+            ipc_factory->message_processor_report());
 
         const auto& session = std::make_shared<mfd::SocketSession>(messenger, next_id(), connected_sessions, msg_processor);
         connected_sessions->add(session);
 
=== modified file 'src/server/frontend/socket_messenger.cpp'
--- src/server/frontend/socket_messenger.cpp	2013-09-25 14:18:18 +0000
+++ src/server/frontend/socket_messenger.cpp	2013-09-26 19:15:16 +0000
@@ -18,13 +18,16 @@
 
 #include "socket_messenger.h"
 #include "mir/frontend/client_constants.h"
+#include "mir/frontend/messenger_report.h"
 
 namespace mfd = mir::frontend::detail;
 namespace bs = boost::system;
 namespace ba = boost::asio;
 
-mfd::SocketMessenger::SocketMessenger(std::shared_ptr<ba::local::stream_protocol::socket> const& socket)
-    : socket(socket)
+mfd::SocketMessenger::SocketMessenger(std::shared_ptr<ba::local::stream_protocol::socket> const& socket,
+                                      std::shared_ptr<MessengerReport> const& report)
+    : socket(socket),
+      report(report)
 {
     whole_message.reserve(serialization_buffer_size);
 }
@@ -59,8 +62,14 @@
     // function has completed (if it would be executed asynchronously.
     // NOTE: we rely on this synchronous behavior as per the comment in
     // mf::SessionMediator::create_surface
+
     boost::system::error_code err;
     ba::write(*socket, ba::buffer(whole_message), err);
+    if (!err)
+    {
+        report->error(err.message());
+    }
+
 }
 
 void mfd::SocketMessenger::send_fds(std::vector<int32_t> const& fds)
 
=== modified file 'src/server/frontend/socket_messenger.h'
--- src/server/frontend/socket_messenger.h	2013-08-28 03:41:48 +0000
+++ src/server/frontend/socket_messenger.h	2013-09-26 19:15:16 +0000
@@ -26,13 +26,16 @@
 {
 namespace frontend
 {
+class MessengerReport;
+
 namespace detail
 {
 class SocketMessenger : public MessageSender,
                         public MessageReceiver
 {
 public:
-    SocketMessenger(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket);
+    SocketMessenger(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
+                    std::shared_ptr<frontend::MessengerReport> const& report);
 
     void send(std::string const& body);
     void send_fds(std::vector<int32_t> const& fds);
@@ -42,6 +45,8 @@
 
 private:
     std::shared_ptr<boost::asio::local::stream_protocol::socket> socket;
+    std::shared_ptr<MessengerReport> const report;
+
     std::vector<char> whole_message;
 };
 }
 
=== modified file 'src/server/logging/CMakeLists.txt'
--- src/server/logging/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ src/server/logging/CMakeLists.txt	2013-09-26 19:15:16 +0000
@@ -6,6 +6,7 @@
   message_processor_report.cpp
   display_report.cpp
   input_report.cpp
+  messenger_report.cpp
 )
 
 add_library(
 
=== added file 'src/server/logging/messenger_report.cpp'
--- src/server/logging/messenger_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/logging/messenger_report.cpp	2013-09-26 19:15:16 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/logging/messenger_report.h"
+#include "mir/logging/logger.h"
+
+#include "std/MirLog.h"
+#include <std/Log.h>
+
+
+#include <sstream>
+#include <cstring>
+#include <mutex>
+
+namespace ml = mir::logging;
+
+ml::MessengerReport::MessengerReport(const std::shared_ptr<Logger>& logger) 
+    : logger(logger)
+{
+}
+
+const char* ml::MessengerReport::component()
+{
+    static const char* s = "messenger";
+    return s;
+}
+
+void ml::MessengerReport::error(std::string const& error_message)
+{
+    logger->log<Logger::informational>(error_message, component());
+}
 
=== modified file 'tests/unit-tests/frontend/CMakeLists.txt'
--- tests/unit-tests/frontend/CMakeLists.txt	2013-09-24 14:13:15 +0000
+++ tests/unit-tests/frontend/CMakeLists.txt	2013-09-26 19:15:16 +0000
@@ -8,6 +8,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_resource_cache.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_session_mediator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_socket_session.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_socket_messenger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_sender.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_global_event_sender.cpp
 )
 
=== added file 'tests/unit-tests/frontend/test_socket_messenger.cpp'
--- tests/unit-tests/frontend/test_socket_messenger.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit-tests/frontend/test_socket_messenger.cpp	2013-09-26 19:15:16 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel van Vugt <[e-mail]>
+ */
+
+#include "mir/frontend/messenger_report.h"
+#include "src/server/frontend/socket_messenger.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+namespace mf = mir::frontend;
+
+using namespace mf::detail;
+using namespace boost::asio;
+
+TEST(SocketMessengerTest, write_failures_never_throw)
+{
+    io_service svc;
+    auto sock = std::make_shared<local::stream_protocol::socket>(svc);
+    SocketMessenger mess(sock, std::make_shared<mf::NullMessengerReport>());
+
+    EXPECT_NO_THROW( mess.send("foo") );
+}