Skip to content

test579, improve robustness #14454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

test579, improve robustness #14454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e432f
test579, improve robustness
icing Aug 8, 2024
ff18284
change == to <= on comparing double arg
icing Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions tests/data/test579
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
# Verify data after the test has been "shot"
<verify>
<file name="%LOGDIR/ip%TESTNUMBER">
Progress callback called with UL 0 out of 0
Progress callback called with UL 5 out of 0
Progress callback called with UL 0 out of 0
Progress callback called with UL 8 out of 0
Progress callback called with UL 16 out of 0
Progress callback called with UL 26 out of 0
Progress callback called with UL 61 out of 0
Progress callback called with UL 66 out of 0
Progress: start UL 0/0
Progress: end UL 5/0
Progress: start UL 0/0
Progress: end UL 66/0
</file>
</verify>
</testcase>
39 changes: 24 additions & 15 deletions tests/libtest/lib579.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,38 @@ struct WriteThis {
int counter;
};

static bool started = FALSE;
static size_t last_ul = 0;
static size_t last_ul_total = 0;

static void progress_final_report(void)
{
FILE *moo = fopen(libtest_arg2, "ab");
fprintf(moo, "Progress: end UL %zu/%zu\n", last_ul, last_ul_total);
started = FALSE;
fclose(moo);
}

static int progress_callback(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow)
{
static int prev_ultotal = -1;
static int prev_ulnow = -1;
(void)clientp; /* UNUSED */
(void)dltotal; /* UNUSED */
(void)dlnow; /* UNUSED */

/* to avoid depending on timing, which will cause this progress function to
get called a different number of times depending on circumstances, we
only log these lines if the numbers are different from the previous
invoke */
if((prev_ultotal != (int)ultotal) ||
(prev_ulnow != (int)ulnow)) {
if(started && ulnow <= 0.0 && last_ul) {
progress_final_report();
}

last_ul = (size_t)ulnow;
last_ul_total = (size_t)ultotal;
if(!started) {
FILE *moo = fopen(libtest_arg2, "ab");
if(moo) {
fprintf(moo, "Progress callback called with UL %d out of %d\n",
(int)ulnow, (int)ultotal);
fclose(moo);
}
prev_ulnow = (int) ulnow;
prev_ultotal = (int) ultotal;
fprintf(moo, "Progress: start UL %zu/%zu\n", last_ul, last_ul_total);
started = TRUE;
fclose(moo);
}

return 0;
}

Expand Down Expand Up @@ -146,6 +153,8 @@ CURLcode test(char *URL)
/* Perform the request, res will get the return code */
res = curl_easy_perform(curl);

progress_final_report();

test_cleanup:

/* clean up the headers list */
Expand Down
Loading