generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Cleaned up netrc testing.

Browse Source 
Removed the "netrc_debug" keyword replaced with --netrc-file additions.
Removed the debug code from Curl_parsenetrc as it is superseeded by
--netrc-file.
This commit is contained in:
Julien Chaffraix 2011-02-20 21:10:36 -08:00
parent 06fc3569d2
commit 9f8e960a1a
8 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/netrc.c
View File

@ -80,21 +80,6 @@ int Curl_parsenetrc(const char *host,
#define NETRC DOT_CHAR "netrc"
#ifdef DEBUGBUILD
{
/* This is a hack to allow testing.
* If compiled with --enable-debug and CURL_DEBUG_NETRC is defined,
* then it's the path to a substitute .netrc for testing purposes *only* */
char *override = curl_getenv("CURL_DEBUG_NETRC");
if(override) {
fprintf(stderr, "NETRC: overridden " NETRC " file: %s\n", override);
netrcfile = override;
netrc_alloc = TRUE;
}
}
#endif /* DEBUGBUILD */
if(!netrcfile) {
home = curl_getenv("HOME"); /* portable environment reader */
if(home) {

5
tests/data/test130
View File

@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
ftp
</server>
@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; no user/pass) dir list PASV
</name>
<command>
--netrc-optional ftp://%HOSTIP:%FTPPORT/
--netrc-optional --netrc-file log/netrc ftp://%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl

5
tests/data/test131
View File

@ -31,9 +31,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
ftp
</server>
@ -41,7 +38,7 @@ ftp
FTP (optional .netrc; user/no pass) dir list PASV
</name>
<command>
--netrc-optional ftp://user2@%HOSTIP:%FTPPORT/
--netrc-optional --netrc-file log/netrc ftp://user2@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl

5
tests/data/test132
View File

@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
ftp
</server>
@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; user/passwd supplied) dir list PASV
</name>
<command>
--netrc-optional ftp://mary:mark@%HOSTIP:%FTPPORT/
--netrc-optional --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl

5
tests/data/test133
View File

@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
ftp
</server>
@ -40,7 +37,7 @@ ftp
FTP (compulsory .netrc; ignored user/passwd) dir list PASV
</name>
<command>
-n ftp://mary:mark@%HOSTIP:%FTPPORT/
-n --netrc-file log/netrc ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl

5
tests/data/test134
View File

@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
#
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
ftp
</server>
@ -40,7 +37,7 @@ ftp
FTP (optional .netrc; programmatic user/passwd) dir list PASV
</name>
<command>
--netrc-optional -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
--netrc-optional --netrc-file log/netrc -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
</command>
<file name="log/netrc" >
# the following two lines were created while testing curl

5
tests/data/test257
View File

@ -64,9 +64,6 @@ If this is received, the location following worked
# Client-side
<client>
<features>
netrc_debug
</features>
<server>
http
</server>
@ -74,7 +71,7 @@ http
HTTP Location: following with --netrc-optional
</name>
<command>
http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional
http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc
</command>
# netrc auth for two out of three sites:

14
tests/runtests.pl
View File

@ -2146,8 +2146,6 @@ sub checksystem {
if($feat =~ /debug/i) {
# curl was built with --enable-debug
$debug_build = 1;
# set the NETRC debug env
$ENV{'CURL_DEBUG_NETRC'} = "$LOGDIR/netrc";
}
if($feat =~ /SSL/i) {
# ssl enabled
@ -2476,20 +2474,12 @@ sub singletest {
next;
}
}
elsif($f eq "axTLS") {
if($has_axtls) {
next;
}
}
elsif($f eq "netrc_debug") {
if($debug_build) {
elsif($f eq "axTLS") {
if($has_axtls) {
next;
}
}
elsif($f eq "unittest") {
# Unit tests should set the netrc filename directly, thus unset the
# environment variable.
delete($ENV{'CURL_DEBUG_NETRC'}) if $ENV{'CURL_DEBUG_NETRC'};
if($debug_build) {
next;
}