Skip to content

Commit 7f41e7c

Browse files
committed
Fix test_report_long_error
1 parent b0c3608 commit 7f41e7c

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

runtests

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash -ex
1+
#!/bin/bash -e
22

33
VALGRIND=0
44
REDIS_FOLDER=""

test/test_main.c

+17-15
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ static void test_examples(void **state) {
111111

112112
RdbRes handle_start_rdb_report_long_errors(RdbParser *p, void *userData, int rdbVersion) {
113113
UNUSED(userData, rdbVersion);
114-
for (int i = 1 ; i < 1000; i++)
114+
for (int i = 2 ; i < 1000; i++)
115115
RDB_reportError(p, (RdbRes) i, "Error Report number:%d", i);
116116
return 1001; /* This value will be eventually returned as the error code */
117117
}
118+
118119
static void test_report_long_error(void **state) {
119120
RdbStatus status;
120121
UNUSED(state);
@@ -131,20 +132,21 @@ static void test_report_long_error(void **state) {
131132
assert_int_equal(status, RDB_STATUS_ERROR);
132133
const char *returned = RDB_getErrorMessage(parser);
133134
const char *expected =
134-
"[errcode=1] [elementRdbHeader::State=0] Error Report number:1\n[errcode=2] [elementRdbHeader::State=0] Error Report number:2\n"
135-
"[errcode=3] [elementRdbHeader::State=0] Error Report number:3\n[errcode=4] [elementRdbHeader::State=0] Error Report number:4\n"
136-
"[errcode=5] [elementRdbHeader::State=0] Error Report number:5\n[errcode=6] [elementRdbHeader::State=0] Error Report number:6\n"
137-
"[errcode=7] [elementRdbHeader::State=0] Error Report number:7\n[errcode=8] [elementRdbHeader::State=0] Error Report number:8\n"
138-
"[errcode=9] [elementRdbHeader::State=0] Error Report number:9\n[errcode=10] [elementRdbHeader::State=0] Error Report number:10\n"
139-
"[errcode=11] [elementRdbHeader::State=0] Error Report number:11\n[errcode=12] [elementRdbHeader::State=0] Error Report number:12\n"
140-
"[errcode=13] [elementRdbHeader::State=0] Error Report number:13\n[errcode=14] [elementRdbHeader::State=0] Error Report number:14\n"
141-
"[errcode=15] [elementRdbHeader::State=0] Error Report number:15\n[errcode=16] [elementRdbHeader::State=0] Error Report number:16\n"
142-
"[errcode=17] [elementRdbHeader::State=0] Error Report number:17\n[errcode=18] [elementRdbHeader::State=0] Error Report number:18\n"
143-
"[errcode=19] [elementRdbHeader::State=0] Error Report number:19\n[errcode=20] [elementRdbHeader::State=0] Error Report number:20\n"
144-
"[errcode=21] [elementRdbHeader::State=0] Error Report number:21\n[errcode=22] [elementRdbHeader::State=0] Error Report number:22\n"
145-
"[errcode=23] [elementRdbHeader::State=0] Error Report number:23\n[errcode=24] [elementRdbHeader::State=0] Error Report number:24\n"
146-
"[errcode=25] [elementRdbHeader::State=0] Error Report number:25\n[errcode=26] [elem\n... last recorded error message: ...\n"
147-
"[errcode=999] [elementRdbHeader::State=0] Error Report number:999\n";
135+
"[errcode=2] [elementRdbHeader::State=0] Error Report number:2\n"
136+
"[errcode=3] [elementRdbHeader::State=0] Error Report number:3\n[errcode=4] [elementRdbHeader::State=0] Error Report number:4\n"
137+
"[errcode=5] [elementRdbHeader::State=0] Error Report number:5\n[errcode=6] [elementRdbHeader::State=0] Error Report number:6\n"
138+
"[errcode=7] [elementRdbHeader::State=0] Error Report number:7\n[errcode=8] [elementRdbHeader::State=0] Error Report number:8\n"
139+
"[errcode=9] [elementRdbHeader::State=0] Error Report number:9\n[errcode=10] [elementRdbHeader::State=0] Error Report number:10\n"
140+
"[errcode=11] [elementRdbHeader::State=0] Error Report number:11\n[errcode=12] [elementRdbHeader::State=0] Error Report number:12\n"
141+
"[errcode=13] [elementRdbHeader::State=0] Error Report number:13\n[errcode=14] [elementRdbHeader::State=0] Error Report number:14\n"
142+
"[errcode=15] [elementRdbHeader::State=0] Error Report number:15\n[errcode=16] [elementRdbHeader::State=0] Error Report number:16\n"
143+
"[errcode=17] [elementRdbHeader::State=0] Error Report number:17\n[errcode=18] [elementRdbHeader::State=0] Error Report number:18\n"
144+
"[errcode=19] [elementRdbHeader::State=0] Error Report number:19\n[errcode=20] [elementRdbHeader::State=0] Error Report number:20\n"
145+
"[errcode=21] [elementRdbHeader::State=0] Error Report number:21\n[errcode=22] [elementRdbHeader::State=0] Error Report number:22\n"
146+
"[errcode=23] [elementRdbHeader::State=0] Error Report number:23\n[errcode=24] [elementRdbHeader::State=0] Error Report number:24\n"
147+
"[errcode=25] [elementRdbHeader::State=0] Error Report number:25\n[errcode=26] [elementRdbHeader::State=0] Error Report number:26\n"
148+
"[errcode=27] [el\n... last recorded error message: ...\n[errcode=999] [elementRdbHeader::State=0] Error Report number:999\n";
149+
148150
assert_string_equal(returned, expected);
149151
assert_int_equal(RDB_getErrorCode(parser), 1001);
150152
RDB_deleteParser(parser);

0 commit comments

Comments
 (0)