kdbus-test: fix activator for non-TIZEN
authorKonrad Lipinski <konrad.l@samsung.com>
Thu, 15 Sep 2016 12:31:54 +0000 (14:31 +0200)
committerKonrad Lipinski <konrad.l@samsung.com>
Thu, 15 Sep 2016 12:31:54 +0000 (14:31 +0200)
tools/testing/selftests/kdbus/test-activator.c

index b11fddea6f6a62d113778d8ad27e064d0fff63c8..2f519103879be1c554df7867dbb75ef964d34c6d 100644 (file)
@@ -46,7 +46,7 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
 {
        struct kdbus_msg *msg = NULL;
        uint64_t cookie = 0xdeadbeef;
-       uint64_t flags = KDBUS_NAME_REPLACE_EXISTING;
+       uint64_t flags;
        struct kdbus_conn *activator;
        struct kdbus_conn *service;
        struct kdbus_conn *client;
@@ -113,9 +113,11 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
        /* Policies are still checked, access denied */
 
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
+               flags = KDBUS_NAME_REPLACE_EXISTING;
                ASSERT_RETURN(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
        }));
 
+       flags = KDBUS_NAME_REPLACE_EXISTING;
        ASSERT_ZERO(kdbus_name_acquire(service, "foo.priv.activator", &flags));
 
        /* We read our previous starter message */
@@ -185,7 +187,8 @@ static wur int kdbus_priv_activator(struct kdbus_test_env *env)
        ASSERT_ZERO(kdbus_msg_recv_poll(service, 100, NULL, NULL));
 
        RUN_UNPRIVILEGED_CONN(unpriv, env->buspath, ({
-               ASSERT_RETURN(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
+               flags = KDBUS_NAME_REPLACE_EXISTING;
+               ASSERT_EXIT(-EPERM,==,kdbus_name_acquire(unpriv, "foo.priv.activator", &flags));
        }));
 
        kdbus_conn_free(service);