1
=== modified file 'tests/unit-tests/dispatch/test_threaded_dispatcher.cpp'
2
--- tests/unit-tests/dispatch/test_threaded_dispatcher.cpp	2016-08-26 09:24:42 +0000
3
+++ tests/unit-tests/dispatch/test_threaded_dispatcher.cpp	2017-01-09 02:59:00 +0000
4
@@ -259,7 +259,6 @@
5
259
    using namespace testing;
259
    using namespace testing;
6
260
    using namespace std::chrono_literals;
260
    using namespace std::chrono_literals;
7
261
261
8
262
    FLAGS_gtest_death_test_style = "threadsafe";
9
263
    constexpr char const* exception_msg = "Ducks! Ducks attack!";
262
    constexpr char const* exception_msg = "Ducks! Ducks attack!";
10
264
263
11
265
    auto dispatchable = std::make_shared<mt::TestDispatchable>([]()
264
    auto dispatchable = std::make_shared<mt::TestDispatchable>([]()
12
@@ -406,12 +405,18 @@
13
406
405
14
407
    MIR_EXPECT_EXIT(
406
    MIR_EXPECT_EXIT(
15
408
    {
407
    {
21
409
        md::ThreadedDispatcher* dispatcher;
408
        std::atomic<md::ThreadedDispatcher*> dispatcher;
22
410
409
23
411
        auto dispatchable = std::make_shared<mt::TestDispatchable>([&dispatcher]() { delete dispatcher; });
410
        auto dispatchable = std::make_shared<mt::TestDispatchable>(
24
412
411
            [&dispatcher]()
25
413
        dispatchable->trigger();
412
            {
26
413
                delete dispatcher.load();
27
414
            });
28
415
29
414
        dispatcher = new md::ThreadedDispatcher("Death thread", dispatchable);
416
        dispatcher = new md::ThreadedDispatcher("Death thread", dispatchable);
30
417
31
418
        dispatchable->trigger();
32
419
33
415
        std::this_thread::sleep_for(10s);
420
        std::this_thread::sleep_for(10s);
34
416
    }, KilledBySignal(SIGABRT), ".*Destroying ThreadedDispatcher.*");
421
    }, KilledBySignal(SIGABRT), ".*Destroying ThreadedDispatcher.*");
35
417
}
422
}
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-01-11
Cemil Azizoglu (community)			Approve on 2017-01-10
Brandon Schaefer (community)			Approve on 2017-01-10
Alan Griffiths			Approve on 2017-01-10
Daniel van Vugt		2017-01-09	Abstain on 2017-01-09
Review via email: mp+314304@code.launchpad.net
1	=== modified file 'tests/unit-tests/dispatch/test_threaded_dispatcher.cpp'
2	--- tests/unit-tests/dispatch/test_threaded_dispatcher.cpp 2016-08-26 09:24:42 +0000
3	+++ tests/unit-tests/dispatch/test_threaded_dispatcher.cpp 2017-01-09 02:59:00 +0000
4	@@ -259,7 +259,6 @@
5	259	using namespace testing;	259	using namespace testing;
6	260	using namespace std::chrono_literals;	260	using namespace std::chrono_literals;
7	261		261
8	262	FLAGS_gtest_death_test_style = "threadsafe";
9	263	constexpr char const* exception_msg = "Ducks! Ducks attack!";	262	constexpr char const* exception_msg = "Ducks! Ducks attack!";
10	264		263
11	265	auto dispatchable = std::make_shared<mt::TestDispatchable>([]()	264	auto dispatchable = std::make_shared<mt::TestDispatchable>([]()
12	@@ -406,12 +405,18 @@
13	406		405
14	407	MIR_EXPECT_EXIT(	406	MIR_EXPECT_EXIT(
15	408	{	407	{
21	409	md::ThreadedDispatcher* dispatcher;	408	std::atomic<md::ThreadedDispatcher*> dispatcher;
22	410		409
23	411	auto dispatchable = std::make_shared<mt::TestDispatchable>([&dispatcher]() { delete dispatcher; });	410	auto dispatchable = std::make_shared<mt::TestDispatchable>(
24	412		411	[&dispatcher]()
25	413	dispatchable->trigger();	412	{
26			413	delete dispatcher.load();
27			414	});
28			415
29	414	dispatcher = new md::ThreadedDispatcher("Death thread", dispatchable);	416	dispatcher = new md::ThreadedDispatcher("Death thread", dispatchable);
30			417
31			418	dispatchable->trigger();
32			419
33	415	std::this_thread::sleep_for(10s);	420	std::this_thread::sleep_for(10s);
34	416	}, KilledBySignal(SIGABRT), ".Destroying ThreadedDispatcher.");	421	}, KilledBySignal(SIGABRT), ".Destroying ThreadedDispatcher.");
35	417	}	422	}