Add ipv6 parse function tests

include/monitor.h

@@ -83,6 +83,7 @@ int pyfcgi_monitor_check_sock(const char*);
  * @param int[3] socket creation arguments
  * @param pyfcgi_monitor_addr_t the addr to bind to
  * @return 0 if no error else -1
+ * @todo add support for xxx://[IPV6]:port
  */
 int pyfcgi_monitor_parse_sock(const char*, int[3], pyfcgi_monitor_addr_t*);
 
@@ -92,6 +93,7 @@ int pyfcgi_monitor_parse_sock(const char*, int[3], pyfcgi_monitor_addr_t*);
  * @param pyfcgi_monitor_addr_t* the addr pointer
  * @param int* if not NULL will be set to choosen domain
  * @return 0 if no erro else -1
+ * @todo add support for xxx://[IPV6]:port
  */
 int pyfcgi_monitor_parse_inet_addr(const char*, int, pyfcgi_monitor_addr_t*, int*);
 

tests/check_monitor.c

@@ -14,6 +14,14 @@ static const char *valids[] = {
 	"unix://foo.sock",
 	NULL};
 
+static const char *valids6[] = {
+	"tcp://localhost:8181",
+	"udp://localhost:8000",
+	//"tcp://::1:8000",
+	"unix:///tmp/test/test.sock",
+	"unix://foo.sock",
+	NULL};
+
 static const char *invalids[] = {
 	"localhost:8000",
 	"ttt://127.0.0.1:81",
@@ -55,7 +63,7 @@ START_TEST(test_check_sock_invalid)
 }
 END_TEST
 
-START_TEST(test_parse_sock_valid_v4)
+START_TEST(test_parse_sock_valid_ipv4)
 {
 	pyfcgi_monitor_addr_t addr;
 	int domain, type, protocol, args[3], ret, i;
@@ -97,6 +105,47 @@ START_TEST(test_parse_sock_valid_v4)
 }
 END_TEST
 
+START_TEST(test_parse_sock_valid_ipv6)
+{
+	pyfcgi_monitor_addr_t addr;
+	int domain, type, protocol, args[3], ret, i;
+	const char **urls;
+	char err_msg[256];
+
+	const int expt_ret[] = {
+		AF_INET6, SOCK_STREAM, 0,
+		AF_INET6, SOCK_DGRAM, 0,
+		AF_UNIX, SOCK_STREAM, 0,
+		AF_UNIX, SOCK_STREAM, 0,};
+	const int *expts = expt_ret;
+
+	PyFCGI_conf.ipv6 = 1;
+	i=0;
+
+	for(urls=valids6; *urls != NULL; urls++)
+	{
+		ret = pyfcgi_monitor_parse_sock(*urls, args, &addr);
+		snprintf(err_msg, 256,
+			"returns %d != 0 but '%s' given",
+			ret, *urls);
+		ck_assert_msg(ret == 0, err_msg);
+
+		domain = args[0];
+		type = args[1];
+		protocol = args[2];
+
+		ck_assert_int_eq(expts[0], domain);
+		ck_assert_int_eq(expts[1], type);
+		ck_assert_int_eq(expts[2], protocol);
+
+		/**@todo check returned address */
+		expts+=3;
+		i+=1;
+	}
+}
+END_TEST
+
+
 Suite * logger_suite(void)
 {
 	Suite *s;
@@ -106,7 +155,8 @@ Suite * logger_suite(void)
 	tc_sockurl = tcase_create("Socket URL handling functions");
 	tcase_add_test(tc_sockurl, test_check_sock_valid);
 	tcase_add_test(tc_sockurl, test_check_sock_invalid);
-	tcase_add_test(tc_sockurl, test_parse_sock_valid_v4);
+	tcase_add_test(tc_sockurl, test_parse_sock_valid_ipv4);
+	tcase_add_test(tc_sockurl, test_parse_sock_valid_ipv6);
 
 	suite_add_tcase(s, tc_sockurl);
 	return s;