Merge lp:~robertcarr/mir/fix-1247718 into lp:mir

[Robert Carr]

test_android_communication_package: Do not expect opened fd to be >0, we may
have closed stdin making this a valid value (LP: #1247718)

test_android_communication_package: Do not expect opened fd to be >0, we may have closed stdin making this a valid return value from socket().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/94/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/365/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I think you forgot the other location mentioned in bug 1247718:
tests/unit-tests/input/android/test_android_input_manager.cpp:159

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

8 - EXPECT_GT(server_fd, 0);
9 - EXPECT_GT(client_fd, 0);

OK, so zero could be valid, but what about <0? Maybe:

EXPECT_LE(0, server_fd);
EXPECT_LE(0, client_fd);

review: Needs Information

[Robert Carr (robertcarr)]

Changed the test in test_android_input-manager.cpp

instated EXPECT_LE.

Thanks :)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Kevin DuBois (kdub)]

looks ok

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

Landed. Then unlanded because it's causing problems :(

/home/dan/bzr/mir/dev/tests/unit-tests/input/android/test_android_input_manager.cpp: In member function ‘virtual void AndroidInputManagerSetup_manager_returns_android_input_channel_Test::TestBody()’:
/home/dan/bzr/mir/dev/tests/unit-tests/input/android/test_android_input_manager.cpp:159:24: error: ‘dynamic_ptr_cast’ is not a member of ‘std’
     EXPECT_NE(nullptr, std::dynamic_ptr_cast<mia::AndroidInputChannel>(package));
                        ^
/home/dan/bzr/mir/dev/tests/unit-tests/input/android/test_android_input_manager.cpp:159:70: error: expected primary-expression before ‘>’ token
     EXPECT_NE(nullptr, std::dynamic_ptr_cast<mia::AndroidInputChannel>(package));
                                                                      ^
It will be nice when CI is working again :)

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

You may also have to resubmit. Because development-branch now has metadata saying this branch is already merged, which is only half true.

=== modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp'
--- tests/unit-tests/input/android/test_android_input_manager.cpp	2013-11-12 02:55:58 +0000
+++ tests/unit-tests/input/android/test_android_input_manager.cpp	2013-11-12 23:10:03 +0000
@@ -155,6 +155,10 @@
     mia::InputManager manager(event_hub, dispatcher, reader_thread, dispatcher_thread);
 
     auto package = manager.make_input_channel();
+<<<<<<< TREE
     EXPECT_GT(package->client_fd(), 0);
     EXPECT_GT(package->server_fd(), 0);
+=======
+    EXPECT_NE(nullptr, std::dynamic_pointer_cast<mia::AndroidInputChannel>(package));
+>>>>>>> MERGE-SOURCE
 }