summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Chevalier <chevalier.ronny@gmail.com>2016-03-02 23:58:48 +0100
committerRonny Chevalier <chevalier.ronny@gmail.com>2016-03-03 19:04:06 +0100
commitd5b29bb5d901d7426e93e6268c548ddb68e468ec (patch)
treea40daac4d1c5c83aca29ec3d400e784b26cdca6b
parent6329266386f5cf5e1a8ae41b0693b03b63a5e81e (diff)
tests: move user-util related tests to test-user-util.c
-rw-r--r--src/test/test-user-util.c27
-rw-r--r--src/test/test-util.c27
2 files changed, 27 insertions, 27 deletions
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index 42c6a8d5e2..8d1ec19f17 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -37,6 +37,30 @@ static void test_gid_to_name_one(gid_t gid, const char *name) {
assert_se(streq_ptr(t, name));
}
+static void test_parse_uid(void) {
+ int r;
+ uid_t uid;
+
+ r = parse_uid("100", &uid);
+ assert_se(r == 0);
+ assert_se(uid == 100);
+
+ r = parse_uid("65535", &uid);
+ assert_se(r == -ENXIO);
+
+ r = parse_uid("asdsdas", &uid);
+ assert_se(r == -EINVAL);
+}
+
+static void test_uid_ptr(void) {
+
+ assert_se(UID_TO_PTR(0) != NULL);
+ assert_se(UID_TO_PTR(1000) != NULL);
+
+ assert_se(PTR_TO_UID(UID_TO_PTR(0)) == 0);
+ assert_se(PTR_TO_UID(UID_TO_PTR(1000)) == 1000);
+}
+
int main(int argc, char*argv[]) {
test_uid_to_name_one(0, "root");
@@ -48,5 +72,8 @@ int main(int argc, char*argv[]) {
test_gid_to_name_one(0xFFFF, "65535");
test_gid_to_name_one(0xFFFFFFFF, "4294967295");
+ test_parse_uid();
+ test_uid_ptr();
+
return 0;
}
diff --git a/src/test/test-util.c b/src/test/test-util.c
index d769c2191c..1ed6f48774 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -44,7 +44,6 @@
#include "special.h"
#include "string-util.h"
#include "strv.h"
-#include "user-util.h"
#include "util.h"
#include "virt.h"
#include "xattr-util.h"
@@ -195,21 +194,6 @@ static void test_close_many(void) {
unlink(name2);
}
-static void test_parse_uid(void) {
- int r;
- uid_t uid;
-
- r = parse_uid("100", &uid);
- assert_se(r == 0);
- assert_se(uid == 100);
-
- r = parse_uid("65535", &uid);
- assert_se(r == -ENXIO);
-
- r = parse_uid("asdsdas", &uid);
- assert_se(r == -EINVAL);
-}
-
static void test_u64log2(void) {
assert_se(u64log2(0) == 0);
assert_se(u64log2(8) == 3);
@@ -488,15 +472,6 @@ static void test_same_fd(void) {
assert_se(same_fd(b, a) == 0);
}
-static void test_uid_ptr(void) {
-
- assert_se(UID_TO_PTR(0) != NULL);
- assert_se(UID_TO_PTR(1000) != NULL);
-
- assert_se(PTR_TO_UID(UID_TO_PTR(0)) == 0);
- assert_se(PTR_TO_UID(UID_TO_PTR(1000)) == 1000);
-}
-
static void test_sparse_write_one(int fd, const char *buffer, size_t n) {
char check[n];
@@ -580,7 +555,6 @@ int main(int argc, char *argv[]) {
test_container_of();
test_div_round_up();
test_close_many();
- test_parse_uid();
test_u64log2();
test_protect_errno();
test_config_parse_iec_uint64();
@@ -596,7 +570,6 @@ int main(int argc, char *argv[]) {
test_parse_proc_cmdline();
test_raw_clone();
test_same_fd();
- test_uid_ptr();
test_sparse_write();
test_fgetxattrat_fake();
test_runlevel_to_target();