patches attached.
On Sat, Mar 23, 2013 at 12:46 AM, Abhishek Singh <
abhishekkumarsingh....@gmail.com> wrote:
> combined unit test patch for find_uid and io added.
>
>
> On Sat, Mar 23, 2013 at 12:17 AM, Abhishek Singh <
> abhishekkumarsingh....@gmail.com> wrote:
>
>> changes done.
>>
>>
>> On Sat, Mar 23, 2013 at 12:07 AM, Stephen Gallagher
>> <sgall...@redhat.com>wrote:
>>
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> On 03/22/2013 02:33 PM, Abhishek Singh wrote:
>>> > New tests added to success tests. Please review it.
>>> >
>>>
>>> Almost :)
>>>
>>> You can't just test for integer equivalence, because it's conceivable
>>> that there may be other flags returned beyond just the FD_CLOEXEC flag.
>>>
>>> You need to do:
>>> assert_true(ret_flag & FD_CLOEXEC)
>>>
>>> The bitwise comparison will ensure that it's non-zero if the
>>> FD_CLOEXEC flag is set.
>>> -----BEGIN PGP SIGNATURE-----
>>> Version: GnuPG v1.4.13 (GNU/Linux)
>>> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>>>
>>> iEYEARECAAYFAlFMpO4ACgkQeiVVYja6o6OJsQCfeifrXZefJL2CfKR5qFl267XG
>>> LzwAn2AzSlodw/YfT1phEHOFuk6fTXSs
>>> =EyN7
>>> -----END PGP SIGNATURE-----
>>> _______________________________________________
>>> sssd-devel mailing list
>>> sssd-devel@lists.fedorahosted.org
>>> https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
>>>
>>
>>
>
From 3d4db82b46a527a1312481005be2ddd28529451e Mon Sep 17 00:00:00 2001
From: Abhishek Singh <abhishekkumarsingh....@gmail.com>
Date: Sat, 23 Mar 2013 01:36:44 +0530
Subject: [PATCH] cmocka unittest for find_uid added
---
Makefile.am | 21 +++++++-
src/tests/cmocka/test_find_uid.c | 105 +++++++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+), 1 deletion(-)
create mode 100644 src/tests/cmocka/test_find_uid.c
diff --git a/Makefile.am b/Makefile.am
index
39e6e0745b778cead606f536759ce18576af24ce..aa79ae6fbd637c7b1301f37130e729013602ff0d
100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,8 @@ endif
if HAVE_CMOCKA
non_interactive_cmocka_based_tests = \
- nss-srv-tests
+ nss-srv-tests \
+ test-find-uid
endif
check_PROGRAMS = \
@@ -1213,6 +1214,24 @@ nss_srv_tests_LDFLAGS = \
nss_srv_tests_LDADD = \
$(CMOCKA_LIBS) \
libsss_util.la
+
+test_find_uid_DEPENDENCIES = \
+ $(ldblib_LTLIBRARIES)
+test_find_uid_SOURCES = \
+ src/tests/cmocka/test_find_uid.c \
+ src/util/find_uid.c \
+ src/util/atomic_io.c \
+ src/util/strtonum.c
+test_find_uid_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(TALLOC_CFLAGS) \
+ $(DHASH_CFLAGS)
+test_find_uid_LDADD = \
+ libsss_debug.la \
+ $(TALLOC_LIBS) \
+ $(DHASH_LIBS) \
+ $(CMOCKA_LIBS) \
+ libsss_util.la
endif
noinst_PROGRAMS = pam_test_client
diff --git a/src/tests/cmocka/test_find_uid.c b/src/tests/cmocka/test_find_uid.c
new file mode 100644
index
0000000000000000000000000000000000000000..8a7b5dc970a758bf1f8af3f56cda203611a7f017
--- /dev/null
+++ b/src/tests/cmocka/test_find_uid.c
@@ -0,0 +1,105 @@
+/*
+ SSSD
+
+ find_uid - Utilities tests
+
+ Authors:
+ Abhishek Singh <abhishekkumarsingh....@gmail.com>
+
+ Copyright (C) 2013 Red Hat
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <cmocka.h>
+
+#include "util/find_uid.h"
+#include "tests/common.h"
+#include "dhash.h"
+
+void test_check_if_uid_is_active_success(void ** state)
+{
+ int ret;
+ uid_t uid;
+ bool result;
+
+ uid = getuid();
+
+ ret = check_if_uid_is_active(uid, &result);
+ assert_true(ret == EOK);
+ assert_true(result);
+}
+
+void test_check_if_uid_is_active_fail(void **state)
+{
+ int ret;
+ uid_t uid;
+ bool result;
+
+ uid = (uid_t) -7;
+
+ ret = check_if_uid_is_active(uid, &result);
+ assert_true(ret == EOK);
+ assert_true(!result);
+}
+
+void test_get_uid_table(void **state)
+{
+ int ret;
+ uid_t uid;
+ TALLOC_CTX *tmp_ctx;
+ hash_table_t *table;
+ hash_key_t key;
+ hash_value_t value;
+
+ tmp_ctx = talloc_new(NULL);
+ assert_true(tmp_ctx != NULL);
+
+ ret = get_uid_table(tmp_ctx, &table);
+ assert_true(ret == EOK);
+
+ uid = getuid();
+ key.type = HASH_KEY_ULONG;
+ key.ul = (unsigned long) uid;
+
+ ret = hash_lookup(table, &key, &value);
+ assert_true(ret == HASH_SUCCESS);
+ assert_true(hash_delete(table, &key) == HASH_SUCCESS);
+
+ uid = (uid_t) -7;
+ key.type = HASH_KEY_ULONG;
+ key.ul = (unsigned long) uid;
+
+ ret = hash_lookup(table, &key, &value);
+ assert_true(ret == HASH_ERROR_KEY_NOT_FOUND);
+
+ talloc_free(tmp_ctx);
+}
+
+int main(void)
+{
+ const UnitTest tests[] = {
+ unit_test(test_check_if_uid_is_active_success),
+ unit_test(test_check_if_uid_is_active_fail),
+ unit_test(test_get_uid_table)
+ };
+
+ return run_tests(tests);
+}
--
1.8.1.4
From 2f3281a7b0af9f4a5f53dec0b911b024251ad828 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <abhishekkumarsingh....@gmail.com>
Date: Sat, 23 Mar 2013 01:42:48 +0530
Subject: [PATCH] cmocka unittest for io added
---
Makefile.am | 13 +++-
src/tests/cmocka/test_io.c | 148 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 160 insertions(+), 1 deletion(-)
create mode 100644 src/tests/cmocka/test_io.c
diff --git a/Makefile.am b/Makefile.am
index
aa79ae6fbd637c7b1301f37130e729013602ff0d..fa906e91542764403e926200d880970e8125b8d7
100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,7 +147,8 @@ endif
if HAVE_CMOCKA
non_interactive_cmocka_based_tests = \
nss-srv-tests \
- test-find-uid
+ test-find-uid \
+ test-io
endif
check_PROGRAMS = \
@@ -1232,6 +1233,16 @@ test_find_uid_LDADD = \
$(DHASH_LIBS) \
$(CMOCKA_LIBS) \
libsss_util.la
+
+test_io_DEPENDENCIES = \
+ $(ldblib_LTLIBRARIES)
+test_io_SOURCES = \
+ src/tests/cmocka/test_io.c \
+ src/util/io.c
+test_io_CFLAGS = \
+ $(AM_CFLAGS)
+test_io_LDADD = \
+ $(CMOCKA_LIBS)
endif
noinst_PROGRAMS = pam_test_client
diff --git a/src/tests/cmocka/test_io.c b/src/tests/cmocka/test_io.c
new file mode 100644
index
0000000000000000000000000000000000000000..bed7ef196e73e7e93879b8b659721369e6c0cbb4
--- /dev/null
+++ b/src/tests/cmocka/test_io.c
@@ -0,0 +1,148 @@
+/*
+ SSSD
+
+ find_uid - Utilities tests
+
+ Authors:
+ Abhishek Singh <abhishekkumarsingh....@gmail.com>
+
+ Copyright (C) 2013 Red Hat
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <dirent.h>
+#include <unistd.h>
+
+#include "util/io.h"
+
+#define FILE_PATH "/tmp/test.in"
+#define NON_EX_PATH "non-existent-path"
+
+static void setup_all(void)
+{
+ FILE *fp;
+ fp = fopen(FILE_PATH, "w");
+ if (fp != NULL)
+ fclose(fp);
+ else
+ printf("Error! file test.in can't be created");
+}
+
+static void teardown_all(void)
+{
+ remove(FILE_PATH);
+}
+
+static int get_dirfd(void)
+{
+ int dir_fd;
+ DIR *tmp = opendir("/tmp");
+ if (tmp != NULL)
+ dir_fd = dirfd(tmp);
+
+ return dir_fd;
+}
+
+void test_sss_open_cloexec_success(void **state)
+{
+ int fd;
+ int ret;
+ int ret_flag;
+ int expec_flag;
+ int flags = O_RDWR;
+
+ fd = sss_open_cloexec(FILE_PATH, flags, &ret);
+
+ ret_flag = fcntl(fd, F_GETFD, 0);
+ expec_flag = FD_CLOEXEC;
+
+ assert_true(fd != -1);
+ assert_true(ret_flag & expec_flag);
+
+ close(fd);
+}
+
+void test_sss_open_cloexec_fail(void **state)
+{
+ int fd;
+ int ret;
+ int flags = O_RDWR;
+
+ fd = sss_open_cloexec(NON_EX_PATH, flags, &ret);
+
+ assert_true(fd == -1);
+ assert_int_not_equal(ret, 0);
+
+ close(fd);
+}
+
+void test_sss_openat_cloexec_success(void **state)
+{
+ int fd;
+ int ret;
+ int ret_flag;
+ int expec_flag;
+ int dir_fd;
+ int flags = O_RDWR;
+
+ dir_fd = get_dirfd();
+ fd = sss_openat_cloexec(dir_fd, "test.in", flags, &ret);
+
+ ret_flag = fcntl(fd, F_GETFD, 0);
+ expec_flag = FD_CLOEXEC;
+
+ assert_true(fd != -1);
+ assert_true(ret_flag & expec_flag);
+
+ close(fd);
+}
+
+void test_sss_openat_cloexec_fail(void **state)
+{
+ int fd;
+ int ret;
+ int dir_fd;
+ int flags = O_RDWR;
+
+ dir_fd = get_dirfd();
+ fd = sss_openat_cloexec(dir_fd, NON_EX_PATH, flags, &ret);
+
+ assert_true(fd == -1);
+ assert_int_not_equal(ret, 0);
+
+ close(fd);
+}
+
+int main(void)
+{
+ const UnitTest tests[] = {
+ unit_test_setup_teardown(test_sss_open_cloexec_success, setup_all,
+ teardown_all),
+ unit_test_setup_teardown(test_sss_open_cloexec_fail, setup_all,
+ teardown_all),
+ unit_test_setup_teardown(test_sss_openat_cloexec_success, setup_all,
+ teardown_all),
+ unit_test_setup_teardown(test_sss_openat_cloexec_fail, setup_all,
+ teardown_all)
+ };
+
+ return run_tests(tests);
+}
--
1.8.1.4
From b9f90d1313b91fb7213b006b4efaaf6c50568e26 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <abhishekkumarsingh....@gmail.com>
Date: Sat, 23 Mar 2013 01:47:23 +0530
Subject: [PATCH] filename in comment is corrected
---
src/util/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/io.c b/src/util/io.c
index
4d1f2e74a1607bf7f6a8977ca97455185eba7403..7f979c941d11e78d409f6a9c0f06dd98a29be6e4
100644
--- a/src/util/io.c
+++ b/src/util/io.c
@@ -1,7 +1,7 @@
/*
SSSD
- compact.c
+ io.c
Authors:
Lukas Slebodnik <lsleb...@redhat.com>
--
1.8.1.4
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
