← Back to branch summary

~mir-team/mir/silo0

« back to all changes in this revision

Viewing changes to tests/unit-tests/test_glib_main_loop.cpp

  • Committer: Kevin Gunn
  • Date: 2015-07-30 18:42:46 UTC
  • mfrom: (2696.1.27 0.14)
  • Revision ID: kevin.gunn@canonical.com-20150730184246-djqrvocxsdoy5cu6
revert and merge 0.14

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/test_glib_main_loop.cpp
268
268
            int const signum{SIGUSR1};
269
269
            ml.register_signal_handler(
270
270
                {signum},
271
 
                [&] (int) { throw std::runtime_error(""); });
 
271
                [&] (int) { throw std::runtime_error("signal handler error"); });
272
272
 
273
273
            kill(getpid(), signum);
274
274
 
512
512
            ml.register_fd_handler(
513
513
                {p.read_fd()},
514
514
                this,
515
 
                [] (int) { throw std::runtime_error(""); });
 
515
                [] (int) { throw std::runtime_error("fd handler error"); });
516
516
 
517
517
            EXPECT_EQ(1, write(p.write_fd(), &data_to_write, 1));
518
518
 
753
753
    execute_in_forked_process(this,
754
754
        [&]
755
755
        {
756
 
            ml.enqueue(this, [] { throw std::runtime_error(""); });
 
756
            ml.enqueue(this, [] { throw std::runtime_error("server action error"); });
757
757
 
758
758
            EXPECT_THROW({ ml.run(); }, std::runtime_error);
759
759
        },
771
771
    execute_in_forked_process(this,
772
772
        [&]
773
773
        {
774
 
            ml.enqueue(this, [] { throw std::runtime_error(""); });
 
774
            ml.enqueue(this, [] { throw std::runtime_error("server action error"); });
775
775
 
776
776
            EXPECT_THROW({
777
777
                ml.run();
1061
1061
    execute_in_forked_process(this,
1062
1062
        [&]
1063
1063
        {
1064
 
            auto alarm = ml.create_alarm([] { throw std::runtime_error(""); });
 
1064
            auto alarm = ml.create_alarm([] { throw std::runtime_error("alarm error"); });
1065
1065
            alarm->reschedule_in(std::chrono::milliseconds{0});
1066
1066
 
1067
1067
            EXPECT_THROW({ ml.run(); }, std::runtime_error);