Commit 5ed03ebe authored by Yang Tse's avatar Yang Tse
Browse files

test 1503: same as 1502 but with a different cleanup sequence

parent 3456bbc4

tests/data/DISABLED

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 
594

1209

1211

1503

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ test1379 test1380 test1381 test1382 test1383 test1384 test1385 test1386 \ 
test1387 test1388 test1389 test1390 test1391 test1392 test1393 \

test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \

test1408 test1409 test1410 test1411 test1412 test1413 \

test1500 test1501 test1502 \

test1500 test1501 test1502 test1503 \

test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \

test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \

test2016 test2017 test2018 test2019 test2020 test2021 test2022 \

tests/data/test1503

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

<info>

<keywords>

HTTP

HTTP GET

multi

CURLOPT_RESOLVE

</keywords>

</info>



<reply>

<data>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



-foo-

</data>

</reply>



#

# Client-side

<client>

<server>

http

</server>

<tool>

lib1503

</tool>

 <name>

HTTP multi with CURLOPT_RESOLVE, cleanup sequence PA

 </name>

 <command>

http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>

<strip>

^User-Agent:.*

</strip>

<protocol>

GET /1503 HTTP/1.1

Host: google.com:%HTTPPORT

Accept: */*



</protocol>

</verify>

</testcase>

tests/libtest/Makefile.inc

+6 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ noinst_PROGRAMS = chkhostname \ 
  lib556 lib539 lib557 lib560 lib562 lib564 lib565 lib566 lib567 lib568	\

  lib569 lib570 lib571 lib572 lib573 lib582 lib583 lib585 lib586 lib587 \

  lib590 lib591 lib597 lib598 lib599 libauthretry libntlmconnect \

  lib1500 lib1501 lib1502

  lib1500 lib1501 lib1502 lib1503



chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c

chkhostname_LDADD = @CURL_NETWORK_LIBS@
@@ -218,6 +218,11 @@ lib1501_LDADD = $(TESTUTIL_LIBS) 


lib1502_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)

lib1502_LDADD = $(TESTUTIL_LIBS)

lib1502_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1502



lib1503_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)

lib1503_LDADD = $(TESTUTIL_LIBS)

lib1503_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1503



libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES)

tests/libtest/lib1502.c

+11 −0
Original line number Diff line number Diff line
@@ -106,11 +106,22 @@ int test(char *URL) 


test_cleanup:



#ifdef LIB1502

  /* undocumented cleanup sequence - type UA */



  curl_multi_cleanup(multi);

  curl_easy_cleanup(easy);

  curl_global_cleanup();

#endif



#ifdef LIB1503

  /* proper cleanup sequence - type PA */



  curl_multi_remove_handle(multi, easy);

  curl_multi_cleanup(multi);

  curl_easy_cleanup(easy);

  curl_global_cleanup();

#endif



  curl_slist_free_all(dns_cache_list);