Commit 62da1e74 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

test1513: added - verify early progress callback return fail 

Verify the change brought in commit 8e11731653061. It makes sure that
returning a failure from the progress callback even very early results
in the correct return code.
parent bf24b64e

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \ 
test1408 test1409 test1410          test1412 test1413 test1414 test1415 \

\

test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \

test1508 test1509 test1510 test1511 test1512 \

test1508 test1509 test1510 test1511 test1512 test1513 \

\

test1900 test1901 test1902 test1903 \

\

tests/data/test1513

0 → 100644
+39 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

PROGRESSGFUNCTION

</keywords>

</info>



# Server-side

<reply>

</reply>



# Client-side

<client>

<server>

none

</server>

<tool>

lib1513

</tool>

 <name>

return failure immediately from progress callback

 </name>



# this server/host won't be used for real

 <command>

http://localhost/1513

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<protocol>

</protocol>

# 42 == CURLE_ABORTED_BY_CALLBACK

<errorcode>

42

</errorcode>

</verify>

</testcase>

tests/libtest/Makefile.inc

+5 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ 
 lib571 lib572 lib573 lib574 lib575 lib576        lib578 lib579 lib582   \

 lib583 lib585 lib586 lib587        lib590 lib591 lib597 lib598 lib599   \

 lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \

 lib1509 lib1510 lib1511 lib1512 \

 lib1509 lib1510 lib1511 lib1512 lib1513 \

 lib1900 \

 lib2033
@@ -343,6 +343,10 @@ lib1512_SOURCES = lib1512.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) 
lib1512_LDADD = $(TESTUTIL_LIBS)

lib1512_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1512



lib1513_SOURCES = lib1513.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)

lib1513_LDADD = $(TESTUTIL_LIBS)

lib1513_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1513



lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)

lib1900_LDADD = $(TESTUTIL_LIBS)

lib1900_CPPFLAGS = $(AM_CPPFLAGS)

tests/libtest/lib1513.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at http://curl.haxx.se/docs/copyright.html.

 *

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 ***************************************************************************/

/*

 * Test case converted from bug report #1318 by Petr Novak.

 *

 * Before the fix, this test program returned 52 (CURLE_GOT_NOTHING) instead

 * of 42 (CURLE_ABORTED_BY_CALLBACK).

 */



#include "test.h"



#include "memdebug.h"



static int progressKiller(void *arg)

{

  (void)arg;

  return 1;

}



int test(char *URL)

{

  CURL *curl;

  CURLcode result;

  int res=0;



  global_init(CURL_GLOBAL_ALL);



  easy_init(curl);



  easy_setopt(curl, CURLOPT_URL, URL);

  easy_setopt(curl, CURLOPT_TIMEOUT, (long)7);

  easy_setopt(curl, CURLOPT_NOSIGNAL, (long)1);

  easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progressKiller);

  easy_setopt(curl, CURLOPT_PROGRESSDATA, NULL);

  easy_setopt(curl, CURLOPT_NOPROGRESS, (long)0);



  result = curl_easy_perform(curl);



test_cleanup:



  /* undocumented cleanup sequence - type UA */



  curl_easy_cleanup(curl);

  curl_global_cleanup();



  return (int)result;

}