diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-31 03:28:37 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-31 08:56:03 -0400 |
| commit | b2fadec6048adb3596f2633cb7fe7a49f5937a18 (patch) | |
| tree | 8969997ed3730146ff98774b14b3dcd65392c4df /src/test | |
| parent | a2a5291b3f5ab6ed4c92f51d0fd10a03047380d8 (diff) | |
Properly report invalid quoted strings
$ systemd-analyze verify trailing-g.service
[./trailing-g.service:2] Trailing garbage, ignoring.
trailing-g.service lacks ExecStart setting. Refusing.
Error: org.freedesktop.systemd1.LoadFailed: Unit trailing-g.service failed to load: Invalid argument.
Failed to create trailing-g.service/start: Invalid argument
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-strv.c | 17 | ||||
| -rw-r--r-- | src/test/test-util.c | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/test/test-strv.c b/src/test/test-strv.c index cdd2a539af..7ba4c366ac 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -141,6 +141,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted _cleanup_free_ char *p; _cleanup_strv_free_ char **s; char **t; + int r; p = strv_join_quoted((char **)split); assert_se(p); @@ -148,7 +149,8 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted assert_se(p); assert_se(streq(p, quoted)); - s = strv_split_quoted(quoted); + r = strv_split_quoted(&s, quoted); + assert_se(r == 0); assert_se(s); STRV_FOREACH(t, s) { assert_se(*t); @@ -162,8 +164,10 @@ static void test_strv_unquote(const char *quoted, const char **list) { _cleanup_free_ char *j; unsigned i = 0; char **t; + int r; - s = strv_split_quoted(quoted); + r = strv_split_quoted(&s, quoted); + assert_se(r == 0); assert_se(s); j = strv_join(s, " | "); assert(j); @@ -176,10 +180,12 @@ static void test_strv_unquote(const char *quoted, const char **list) { } static void test_invalid_unquote(const char *quoted) { - char **s; + char **s = NULL; + int r; - s = strv_split_quoted(quoted); + r = strv_split_quoted(&s, quoted); assert(s == NULL); + assert(r == -EINVAL); } static void test_strv_split(void) { @@ -441,6 +447,9 @@ int main(int argc, char *argv[]) { test_invalid_unquote("a --b='c \"d e\"'"); test_invalid_unquote("a --b='c \"d e\" '"); test_invalid_unquote("a --b='c \"d e\"garbage"); + test_invalid_unquote("'"); + test_invalid_unquote("\""); + test_invalid_unquote("'x'y"); test_strv_split(); test_strv_split_newlines(); diff --git a/src/test/test-util.c b/src/test/test-util.c index a56b355672..470475aa5d 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -358,6 +358,7 @@ static void test_foreach_word_quoted(void) { assert_se(strneq(expected[i++], word, l)); printf("<%s>\n", t); } + assert(isempty(state)); } static void test_default_term_for_tty(void) { |