Merge d7e58758a6 into 52b0351a15

src/test/test-audit-util.c

@@ -7,26 +7,24 @@ TEST(audit_loginuid_from_pid) {
         _cleanup_(pidref_done) PidRef self = PIDREF_NULL, pid1 = PIDREF_NULL;
         int r;
 
-        ASSERT_OK(pidref_set_self(&self));
+        assert_se(pidref_set_self(&self) >= 0);
-        ASSERT_OK(pidref_set_pid(&pid1, 1));
+        assert_se(pidref_set_pid(&pid1, 1) >= 0);
 
         uid_t uid;
         r = audit_loginuid_from_pid(&self, &uid);
-        if (r != -ENODATA)
+        assert_se(r >= 0 || r == -ENODATA);
-                ASSERT_OK(r);
         if (r >= 0)
                 log_info("self audit login uid: " UID_FMT, uid);
 
-        ASSERT_ERROR(audit_loginuid_from_pid(&pid1, &uid), ENODATA);
+        assert_se(audit_loginuid_from_pid(&pid1, &uid) == -ENODATA);
 
         uint32_t sessionid;
         r = audit_session_from_pid(&self, &sessionid);
-        if (r != -ENODATA)
+        assert_se(r >= 0 || r == -ENODATA);
-                ASSERT_OK(r);
         if (r >= 0)
                 log_info("self audit session id: %" PRIu32, sessionid);
 
-        ASSERT_ERROR(audit_session_from_pid(&pid1, &sessionid), ENODATA);
+        assert_se(audit_session_from_pid(&pid1, &sessionid) == -ENODATA);
 }
 
 static int intro(void) {