Mir

Merge lp:~robertcarr/mir/cbranch-can-not-be-named-fix-1247718 into lp:mir

  1. cbranch-can-not-be-named-fix-1247718
  2. Merge into development-branch
Proposed by Robert Carr
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1240
Proposed branch: lp:~robertcarr/mir/cbranch-can-not-be-named-fix-1247718
Merge into: lp:mir
Diff against target: 34 lines (+4/-4)
2 files modified
tests/unit-tests/input/android/test_android_communication_package.cpp (+2/-2)
tests/unit-tests/input/android/test_android_input_manager.cpp (+2/-2)
To merge this branch: bzr merge lp:~robertcarr/mir/cbranch-can-not-be-named-fix-1247718
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Review via email: mp+195629@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/383/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/193/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/112/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/112/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/383/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

this built for me locally... looks okay too

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1212
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/390/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/119/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/390/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I think you forgot the other half:
test_android_communication_package.cpp

(see bug 1247718)

review: Needs Fixing
Revision history for this message
Robert Carr (robertcarr) wrote :

Fixed after embarrassing levels of branch confusion

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1213
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/128/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/399/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/unit-tests/input/android/test_android_communication_package.cpp'
--- tests/unit-tests/input/android/test_android_communication_package.cpp 2013-11-12 02:55:58 +0000
+++ tests/unit-tests/input/android/test_android_communication_package.cpp 2013-11-19 18:58:39 +0000
@@ -35,8 +35,8 @@
3535
36 server_fd = package.server_fd();36 server_fd = package.server_fd();
37 client_fd = package.client_fd();37 client_fd = package.client_fd();
38 EXPECT_GT(server_fd, 0);38 EXPECT_LE(0, server_fd);
39 EXPECT_GT(client_fd, 0);39 EXPECT_LE(0, client_fd);
4040
41 EXPECT_EQ(fcntl(server_fd, F_GETFD), 0);41 EXPECT_EQ(fcntl(server_fd, F_GETFD), 0);
42 EXPECT_EQ(fcntl(client_fd, F_GETFD), 0);42 EXPECT_EQ(fcntl(client_fd, F_GETFD), 0);
4343
=== 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-19 18:58:39 +0000
@@ -19,6 +19,7 @@
19#include "src/server/input/android/android_input_manager.h"19#include "src/server/input/android/android_input_manager.h"
20#include "src/server/input/android/android_input_thread.h"20#include "src/server/input/android/android_input_thread.h"
21#include "src/server/input/android/android_input_constants.h"21#include "src/server/input/android/android_input_constants.h"
22#include "src/server/input/android/android_input_channel.h"
2223
23#include "mir/input/input_channel.h"24#include "mir/input/input_channel.h"
2425
@@ -155,6 +156,5 @@
155 mia::InputManager manager(event_hub, dispatcher, reader_thread, dispatcher_thread);156 mia::InputManager manager(event_hub, dispatcher, reader_thread, dispatcher_thread);
156157
157 auto package = manager.make_input_channel();158 auto package = manager.make_input_channel();
158 EXPECT_GT(package->client_fd(), 0);159 EXPECT_NE(nullptr, std::dynamic_pointer_cast<mia::AndroidInputChannel>(package));
159 EXPECT_GT(package->server_fd(), 0);
160}160}

Subscribers

People subscribed via source and target branches