Merge lp:~vanvugt/mir/fix-1483097 into lp:mir

[Daniel van Vugt]

Fix spurious test failure that occurs under fakeroot, during deb
builds:
  ClientCredsTestFixture.
  session_authorizer_receives_pid_of_connecting_clients
(LP: #1483097)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2825
http://jenkins.qa.ubuntu.com/job/mir-ci/4512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3462
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/994
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/661
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3410
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6197
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22420

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4512/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
--- tests/acceptance-tests/test_client_authorization.cpp	2015-06-25 03:00:08 +0000
+++ tests/acceptance-tests/test_client_authorization.cpp	2015-08-10 10:28:07 +0000
@@ -64,15 +64,18 @@
     struct SharedRegion
     {
         sem_t client_creds_set;
-        pid_t client_pid;
-        uid_t client_uid;
-        gid_t client_gid;
+        pid_t client_pid = -1;
+        uid_t client_uid = -1;
+        gid_t client_gid = -1;
 
         bool matches_client_process_creds(mf::SessionCredentials const& creds)
         {
+            // A perfect match is perfect. But sometimes it's not a perfect
+            // match and that's OK too. Because fakeroot (used in deb builds)
+            // returns 0 unconditionally, even for non-root users.
             return client_pid == creds.pid() &&
-                   client_uid == creds.uid() &&
-                   client_gid == creds.gid();
+                   (client_uid == 0 || client_uid == creds.uid()) &&
+                   (client_gid == 0 || client_gid == creds.gid());
         }
 
         bool wait_for_client_creds()