~ps-jenkins/mir/latestsnapshot-0.0.15+13.10.20131014-0ubuntu1

Viewing changes to tests/integration-tests/test_display_server_main_loop_events.cpp

Committer: Alan Griffiths
Date: 2013-10-09 15:02:33 UTC
mfrom: (1081.3.39 development-branch)
Revision ID: alan@octopull.co.uk-20131009150233-cxko8jqnkxse131h

client: use lock_guard as it is simpler than unique_lock. (fix for mallit)
frontend: Remove the endpoint first when shutting down. Fixes bug lp#1235159.

files modified:
examples/render_surfaces.cpp

include/server/mir/frontend/connector.h

src/client/display_configuration.cpp

src/client/mir_client_library.cpp

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/run_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

Show diffs side-by-side

added added

removed removed

tests/integration-tests/test_display_server_main_loop_events.cpp

MOCK_METHOD0(start, void());

MOCK_METHOD0(stop, void());

MOCK_CONST_METHOD0(client_socket_fd, int());

MOCK_CONST_METHOD0(remove_endpoint, void());

};

class MockDisplayChanger : public mir::DisplayChanger

Older »