Mir

Merge lp:~alan-griffiths/mir/workaround-1438702 into lp:mir

Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 2449
Proposed branch: lp:~alan-griffiths/mir/workaround-1438702
Merge into: lp:mir
Diff against target: 18 lines (+5/-1)
1 file modified
tests/acceptance-tests/test_client_library_errors.cpp (+5/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/workaround-1438702
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) Approve
Andreas Pokorny (community) Approve
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+254787@code.launchpad.net

Commit message

tests: disable input in more tests that don't use it

Description of the change

tests: disable input in more tests that don't use it

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> The following tests FAILED:
> 98 - mir_unit_tests.AndroidInputReceiverSetup.* (Failed)

Another new, unrelated, input problem?

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> > The following tests FAILED:
> > 98 - mir_unit_tests.AndroidInputReceiverSetup.* (Failed)
>
> Another new, unrelated, input problem?

No, old (and infrequent) lp:1394369

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

okay, although seems there's still a root cause to be found

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

ok.. this will disable input managers.. and solve the issue if they cause the problem.

review: Approve
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Sure.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
2--- tests/acceptance-tests/test_client_library_errors.cpp 2015-03-31 02:35:42 +0000
3+++ tests/acceptance-tests/test_client_library_errors.cpp 2015-04-01 08:50:16 +0000
4@@ -134,9 +134,13 @@
5 return std::make_shared<ConfigurableFailureFactory<failure_set>>();
6 }
7 };
8+
9+struct ClientLibraryErrors : mtf::HeadlessInProcessServer
10+{
11+ ClientLibraryErrors() { add_to_environment("MIR_SERVER_ENABLE_INPUT","off"); }
12+};
13 }
14
15-using ClientLibraryErrors = mtf::HeadlessInProcessServer;
16
17 TEST_F(ClientLibraryErrors, exception_in_client_configuration_constructor_generates_error)
18 {

Subscribers

People subscribed via source and target branches