>> There is also the DEBUGBUILD code used for testing that could be removed
>> if we exposed the right option to curl. I am not sure if this makes sense
>> yet and was planning to look into it.
>
> Yes, the existing netrc tests require DEBUGBUILD since they need to be
> forced to read a custom $HOME I believe so that they find the test .netrc
> file instead of the "actual" one.
Yes, however we use a rather static way to do so
($ENV{'CURL_DEBUG_NETRC}). There is an option in libcurl to set the
.netrc file dynamically. Unfortunately curl does not expose a way of
setting it. What I meant is that we could add a way to access this
option inside curl and remove this code altogether.
> We don't have to have those oddities with unit tests for it. Even of course
> unit tests themselves also require a certain build setup.
Exactly, I have made a quick change to enable that (the second
attachment that keeps passing the WIP netrc test). I feel like this is
a band-aid to our test system but it serves the right purpose for now.
If I don't hear any issues about them, I will proceed and push them
later this week.
Thanks!
Julien
From 2b7f558b0cb77bb261f7a00d01df420d0f7b9e1b Mon Sep 17 00:00:00 2001
From: Julien Chaffraix <[email protected]>
Date: Mon, 7 Feb 2011 22:12:37 -0800
Subject: [PATCH 1/2] test1304: Added some unit tests for Curl_parsenetrc.
Moved some definitons into the header file so that we can reuse them.
---
lib/netrc.c | 5 --
lib/netrc.h | 8 +++-
tests/data/Makefile.am | 3 +-
tests/data/test1304 | 31 ++++++++++++
tests/unit/Makefile.inc | 3 +-
tests/unit/unit1304.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 167 insertions(+), 8 deletions(-)
create mode 100644 tests/data/test1304
create mode 100644 tests/unit/unit1304.c
diff --git a/lib/netrc.c b/lib/netrc.c
index 7e0447d..b069c8c 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -61,11 +61,6 @@ enum host_lookup_state {
HOSTEND /* LAST enum */
};
-/* make sure we have room for at least this size: */
-#define LOGINSIZE 64
-#define PASSWORDSIZE 64
-
-/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
int Curl_parsenetrc(const char *host,
char *login,
char *password,
diff --git a/lib/netrc.h b/lib/netrc.h
index 5406d4c..4db764d 100644
--- a/lib/netrc.h
+++ b/lib/netrc.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <[email protected]>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -21,6 +21,12 @@
* KIND, either express or implied.
*
***************************************************************************/
+
+/* Make sure we have room for at least this size: */
+#define LOGINSIZE 64
+#define PASSWORDSIZE 64
+
+/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
int Curl_parsenetrc(const char *host,
char *login,
char *password,
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 2f4c4bc..3f8196d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -69,7 +69,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test569 test570 test571 test572 test804 test805 test806 test807 test573 \
test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \
test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
- test1303 test320 test321 test322 test323 test324 test1121 test581 test580
+ test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
+ test1304
filecheck:
@mkdir test-place; \
diff --git a/tests/data/test1304 b/tests/data/test1304
new file mode 100644
index 0000000..572e033
--- /dev/null
+++ b/tests/data/test1304
@@ -0,0 +1,31 @@
+<testcase>
+<info>
+<keywords>
+unittest
+netrc
+</keywords>
+</info>
+
+#
+# Client-side
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+netrc_debug
+</features>
+ <name>
+netrc parsing unit tests
+ </name>
+<tool>
+unit1304
+</tool>
+<file name="log/netrc">
+machine example.com login admin password passwd
+machine curl.example.com login none password none
+</file>
+</client>
+
+</testcase>
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 0db217d..6dd7a41 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -3,9 +3,10 @@
UNITFILES = curlcheck.h
# These are all unit test programs
-noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303
+noinst_PROGRAMS = unit1300 unit1301 unit1302 unit1303 unit1304
unit1300_SOURCES = unit1300.c $(UNITFILES)
unit1301_SOURCES = unit1301.c $(UNITFILES)
unit1302_SOURCES = unit1302.c $(UNITFILES)
unit1303_SOURCES = unit1303.c $(UNITFILES)
+unit1304_SOURCES = unit1304.c $(UNITFILES)
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
new file mode 100644
index 0000000..e7d55a5
--- /dev/null
+++ b/tests/unit/unit1304.c
@@ -0,0 +1,125 @@
+#include <stdlib.h>
+#include "curl_config.h"
+#include "setup.h"
+
+#include "netrc.h"
+#include "curlcheck.h"
+
+char login[LOGINSIZE];
+char password[PASSWORDSIZE];
+
+static CURLcode unit_setup(void)
+{
+ password[0] = 0;
+ login[0] = 0;
+ return CURLE_OK;
+}
+
+static void unit_stop(void)
+{
+}
+
+UNITTEST_START
+ int result;
+
+ /*
+ * TODO: We don't specify the filename as it is
+ * overriden when running the test.
+ */
+
+ /*
+ * Test a non existent host in our netrc file.
+ */
+ result = Curl_parsenetrc("test.example.com", login, password, NULL);
+ fail_unless(result == 1, "Host not found should return 1");
+ fail_unless(password[0] == 0, "password should not have been changed");
+ fail_unless(login[0] == 0, "login should not have been changed");
+
+ /*
+ * Test a non existent login in our netrc file.
+ */
+ memcpy(login, "me", 2);
+ result = Curl_parsenetrc("example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should be found");
+ fail_unless(password[0] == 0, "password should not have been changed");
+ fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed");
+
+ /*
+ * Test a non existent login and host in our netrc file.
+ */
+ memcpy(login, "me", 2);
+ result = Curl_parsenetrc("test.example.com", login, password, NULL);
+ fail_unless(result == 1, "Host should be found");
+ fail_unless(password[0] == 0, "password should not have been changed");
+ fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed");
+
+ /*
+ * Test a non existent login (substring of an existing one) in our
+ * netrc file.
+ */
+ memcpy(login, "admi", 4);
+ result = Curl_parsenetrc("example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should be found");
+ fail_unless(password[0] == 0, "password should not have been changed");
+ fail_unless(strncmp(login, "admi", 4) == 0, "login should not have been changed");
+
+ /*
+ * Test a non existent login (superstring of an existing one)
+ * in our netrc file.
+ */
+ memcpy(login, "adminn", 6);
+ result = Curl_parsenetrc("example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should be found");
+ fail_unless(password[0] == 0, "password should not have been changed");
+ fail_unless(strncmp(login, "adminn", 6) == 0, "login should not have been changed");
+
+ /*
+ * Test for the first existing host in our netrc file
+ * with login[0] = 0.
+ */
+ login[0] = 0;
+ result = Curl_parsenetrc("example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should have been found");
+ fail_unless(strncmp(password, "passwd", 6) == 0,
+ "password should be 'passwd'");
+ fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'");
+
+ /*
+ * Test for the first existing host in our netrc file
+ * with login[0] != 0.
+ */
+ password[0] = 0;
+ result = Curl_parsenetrc("example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should have been found");
+ fail_unless(strncmp(password, "passwd", 6) == 0,
+ "password should be 'passwd'");
+ fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'");
+
+ /*
+ * Test for the second existing host in our netrc file
+ * with login[0] = 0.
+ */
+ password[0] = 0;
+ login[0] = 0;
+ result = Curl_parsenetrc("curl.example.com", login, password, NULL);
+ fail_unless(result == 0, "Host should have been found");
+ fail_unless(strncmp(password, "none", 4) == 0,
+ "password should be 'none'");
+ fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'");
+
+ /*
+ * Test for the second existing host in our netrc file
+ * with login[0] != 0.
+ */
+ password[0] = 0;
+ result = Curl_parsenetrc("curl.example.com", login, password, "log/netrc");
+ fail_unless(result == 0, "Host should have been found");
+ fail_unless(strncmp(password, "none", 4) == 0,
+ "password should be 'none'");
+ fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'");
+
+ /* TODO:
+ * Test over the size limit password / login!
+ * Test files with a bad format
+ */
+UNITTEST_STOP
--
1.7.1
From 1be1a1da8f738d2b88705eac9735816a125085f9 Mon Sep 17 00:00:00 2001
From: Julien Chaffraix <[email protected]>
Date: Tue, 8 Feb 2011 08:39:44 -0800
Subject: [PATCH 2/2] netrc: Enable setting up the filename in unit tests.
Unset the environment variable so that we can specify different
filenames in the unit test.
---
tests/data/test1304 | 1 -
tests/runtests.pl | 3 +++
tests/unit/unit1304.c | 25 ++++++++++++-------------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/tests/data/test1304 b/tests/data/test1304
index 572e033..f438a69 100644
--- a/tests/data/test1304
+++ b/tests/data/test1304
@@ -14,7 +14,6 @@ none
</server>
<features>
unittest
-netrc_debug
</features>
<name>
netrc parsing unit tests
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 8d0ff48..e372415 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2487,6 +2487,9 @@ sub singletest {
}
}
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;
}
diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c
index e7d55a5..34a54e9 100644
--- a/tests/unit/unit1304.c
+++ b/tests/unit/unit1304.c
@@ -7,6 +7,7 @@
char login[LOGINSIZE];
char password[PASSWORDSIZE];
+char filename[64];
static CURLcode unit_setup(void)
{
@@ -22,15 +23,13 @@ static void unit_stop(void)
UNITTEST_START
int result;
- /*
- * TODO: We don't specify the filename as it is
- * overriden when running the test.
- */
+ static const char* filename1 = "log/netrc";
+ memcpy(filename, filename1, strlen(filename1));
/*
* Test a non existent host in our netrc file.
*/
- result = Curl_parsenetrc("test.example.com", login, password, NULL);
+ result = Curl_parsenetrc("test.example.com", login, password, filename);
fail_unless(result == 1, "Host not found should return 1");
fail_unless(password[0] == 0, "password should not have been changed");
fail_unless(login[0] == 0, "login should not have been changed");
@@ -39,7 +38,7 @@ UNITTEST_START
* Test a non existent login in our netrc file.
*/
memcpy(login, "me", 2);
- result = Curl_parsenetrc("example.com", login, password, NULL);
+ result = Curl_parsenetrc("example.com", login, password, filename);
fail_unless(result == 0, "Host should be found");
fail_unless(password[0] == 0, "password should not have been changed");
fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed");
@@ -48,7 +47,7 @@ UNITTEST_START
* Test a non existent login and host in our netrc file.
*/
memcpy(login, "me", 2);
- result = Curl_parsenetrc("test.example.com", login, password, NULL);
+ result = Curl_parsenetrc("test.example.com", login, password, filename);
fail_unless(result == 1, "Host should be found");
fail_unless(password[0] == 0, "password should not have been changed");
fail_unless(strncmp(login, "me", 2) == 0, "login should not have been changed");
@@ -58,7 +57,7 @@ UNITTEST_START
* netrc file.
*/
memcpy(login, "admi", 4);
- result = Curl_parsenetrc("example.com", login, password, NULL);
+ result = Curl_parsenetrc("example.com", login, password, filename);
fail_unless(result == 0, "Host should be found");
fail_unless(password[0] == 0, "password should not have been changed");
fail_unless(strncmp(login, "admi", 4) == 0, "login should not have been changed");
@@ -68,7 +67,7 @@ UNITTEST_START
* in our netrc file.
*/
memcpy(login, "adminn", 6);
- result = Curl_parsenetrc("example.com", login, password, NULL);
+ result = Curl_parsenetrc("example.com", login, password, filename);
fail_unless(result == 0, "Host should be found");
fail_unless(password[0] == 0, "password should not have been changed");
fail_unless(strncmp(login, "adminn", 6) == 0, "login should not have been changed");
@@ -78,7 +77,7 @@ UNITTEST_START
* with login[0] = 0.
*/
login[0] = 0;
- result = Curl_parsenetrc("example.com", login, password, NULL);
+ result = Curl_parsenetrc("example.com", login, password, filename);
fail_unless(result == 0, "Host should have been found");
fail_unless(strncmp(password, "passwd", 6) == 0,
"password should be 'passwd'");
@@ -89,7 +88,7 @@ UNITTEST_START
* with login[0] != 0.
*/
password[0] = 0;
- result = Curl_parsenetrc("example.com", login, password, NULL);
+ result = Curl_parsenetrc("example.com", login, password, filename);
fail_unless(result == 0, "Host should have been found");
fail_unless(strncmp(password, "passwd", 6) == 0,
"password should be 'passwd'");
@@ -101,7 +100,7 @@ UNITTEST_START
*/
password[0] = 0;
login[0] = 0;
- result = Curl_parsenetrc("curl.example.com", login, password, NULL);
+ result = Curl_parsenetrc("curl.example.com", login, password, filename);
fail_unless(result == 0, "Host should have been found");
fail_unless(strncmp(password, "none", 4) == 0,
"password should be 'none'");
@@ -112,7 +111,7 @@ UNITTEST_START
* with login[0] != 0.
*/
password[0] = 0;
- result = Curl_parsenetrc("curl.example.com", login, password, "log/netrc");
+ result = Curl_parsenetrc("curl.example.com", login, password, filename);
fail_unless(result == 0, "Host should have been found");
fail_unless(strncmp(password, "none", 4) == 0,
"password should be 'none'");
--
1.7.1
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
