summaryrefslogtreecommitdiffstats
path: root/tests/libknot
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-14 16:17:59 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-14 16:17:59 +0000
commit6dcba6bb2c8f8d96093d0942bb59dece22fdf7ac (patch)
tree5026d1469491de46164ebbc74dac1f7ba5b3cb08 /tests/libknot
parentReleasing progress-linux version 3.3.5-1.1~progress7.99u1. (diff)
downloadknot-6dcba6bb2c8f8d96093d0942bb59dece22fdf7ac.tar.xz
knot-6dcba6bb2c8f8d96093d0942bb59dece22fdf7ac.zip
Merging upstream version 3.3.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/libknot')
-rw-r--r--tests/libknot/test_xdp_tcp.c1
-rw-r--r--tests/libknot/test_yparser.c9
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/libknot/test_xdp_tcp.c b/tests/libknot/test_xdp_tcp.c
index 3e366b1..f6b11b0 100644
--- a/tests/libknot/test_xdp_tcp.c
+++ b/tests/libknot/test_xdp_tcp.c
@@ -92,7 +92,6 @@ static int mock_send(_unused_ knot_xdp_socket_t *sock, const knot_xdp_msg_t msgs
ok(msg->payload.iov_len == 0, "send: is empty payload");
if (msg->flags & KNOT_XDP_MSG_RST) {
- ok(!(msg->flags & KNOT_XDP_MSG_ACK), "send: no RST+ACK");
sent_rsts++;
} else if (msg->flags & KNOT_XDP_MSG_SYN) {
ok(msg->flags & KNOT_XDP_MSG_ACK, "send: is SYN+ACK");
diff --git a/tests/libknot/test_yparser.c b/tests/libknot/test_yparser.c
index 8655096..8b6c31f 100644
--- a/tests/libknot/test_yparser.c
+++ b/tests/libknot/test_yparser.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/* Copyright (C) 2024 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
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
@@ -27,6 +27,9 @@ const char *syntax_ok =
" # comment\n"
"a:\n"
"a :\n"
+ "a: \"\"\n"
+ "a: []\n"
+ "a: [ ]\n"
"a : #comment\n"
"\n"
"b: \"b\"\n"
@@ -118,7 +121,7 @@ static void test_syntax_ok(yp_parser_t *yp)
is_int(KNOT_EOK, ret, "set input string");
size_t line = 3;
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < 6; i++) {
ret = yp_parse(yp);
is_int(KNOT_EOK, ret, "parse %i. key0", i);
ok(yp->key_len == 1 && yp->key[0] == 'a' &&
@@ -126,7 +129,7 @@ static void test_syntax_ok(yp_parser_t *yp)
yp->line_count == line + i, "compare %i. key0", i);
}
- line += 4;
+ line += 7;
for (int i = 0; i < 6; i++) {
ret = yp_parse(yp);
is_int(KNOT_EOK, ret, "parse %i. key0 with value", i);