util: drop parse_user_at_host() since its unused now

[elogind.git] / src / test / test-util.c

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 43bb0249a20e8833cca18d47ff24d9a1b8772d08..cbd60d68f7ff2a01533b5fec18a072f16fbb53ad 100644 (file)
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -490,21 +490,6 @@ static void test_strrep(void) {
         assert_se(streq(zero, ""));
 }
 
-static void test_parse_user_at_host(void) {
-        _cleanup_free_ char *both = strdup("waldo@waldoscomputer");
-        _cleanup_free_ char *onlyhost = strdup("mikescomputer");
-        char *user = NULL, *host = NULL;
-
-        parse_user_at_host(both, &user, &host);
-        assert_se(streq(user, "waldo"));
-        assert_se(streq(host, "waldoscomputer"));
-
-        user = host = NULL;
-        parse_user_at_host(onlyhost, &user, &host);
-        assert_se(user == NULL);
-        assert_se(streq(host, "mikescomputer"));
-}
-
 static void test_split_pair(void) {
         _cleanup_free_ char *a = NULL, *b = NULL;
 
@@ -580,8 +565,8 @@ static void test_in_set(void) {
         assert_se(!IN_SET(0, 1, 2, 3, 4));
 }
 
-static void test_writev_safe(void) {
-        char name[] = "/tmp/test-writev_safe.XXXXXX";
+static void test_writing_tmpfile(void) {
+        char name[] = "/tmp/test-systemd_writing_tmpfile.XXXXXX";
         _cleanup_free_ char *contents;
         size_t size;
         int fd, r;
@@ -592,10 +577,10 @@ static void test_writev_safe(void) {
         IOVEC_SET_STRING(iov[2], "");
 
         fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
-        printf("test_writev_safe: %s", name);
+        printf("tmpfile: %s", name);
 
-        r = writev_safe(fd, iov, 3);
-        assert(r == 0);
+        r = writev(fd, iov, 3);
+        assert(r >= 0);
 
         r = read_full_file(name, &contents, &size);
         assert(r == 0);
@@ -635,12 +620,11 @@ int main(int argc, char *argv[]) {
         test_parse_bytes();
         test_strextend();
         test_strrep();
-        test_parse_user_at_host();
         test_split_pair();
         test_fstab_node_to_udev_node();
         test_get_files_in_directory();
         test_in_set();
-        test_writev_safe();
+        test_writing_tmpfile();
 
         return 0;
 }