svn commit: r292665 - head/lib/libc/tests/resolv

[Garrett Cooper]

Author: ngie
Date: Wed Dec 23 18:48:32 2015
New Revision: 292665
URL: https://svnweb.freebsd.org/changeset/base/292665

Log:
  Increase the timeout for resolv_test from the default (300 seconds) to
  450 seconds
  
  This is required on slower network connections, and on older releases
  (stable/10 seems to be slower as far as name resolution goes.. not sure
  why yet).
  
  Remove an outdated comment in the Makefile from when I was working on
  this code over a year ago on github
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/tests/resolv/Makefile
  head/lib/libc/tests/resolv/resolv_test.c

Modified: head/lib/libc/tests/resolv/Makefile
==============================================================================
--- head/lib/libc/tests/resolv/Makefile	Wed Dec 23 18:24:40 2015	(r292664)
+++ head/lib/libc/tests/resolv/Makefile	Wed Dec 23 18:48:32 2015	(r292665)
@@ -6,7 +6,6 @@ BINDIR=		${TESTSDIR}
 FILES+=		mach
 
 ATF_TESTS_C+=	resolv_test
-#TEST_METADATA.resolv_test=	timeout="1800"
 
 # Note: this test relies on being dynamically linked.  You will get a
 # spurious PASS for a statically linked test.

Modified: head/lib/libc/tests/resolv/resolv_test.c
==============================================================================
--- head/lib/libc/tests/resolv/resolv_test.c	Wed Dec 23 18:24:40 2015	(r292664)
+++ head/lib/libc/tests/resolv/resolv_test.c	Wed Dec 23 18:48:32 2015	(r292665)
@@ -289,21 +289,31 @@ do {									\
 	ATF_REQUIRE(run_tests(_hostlist_file, method) == 0);		\
 } while(0)
 
-ATF_TC_WITHOUT_HEAD(getaddrinfo_test);
+ATF_TC(getaddrinfo_test);
+ATF_TC_HEAD(getaddrinfo_test, tc) {
+	atf_tc_set_md_var(tc, "timeout", "450");
+}
 ATF_TC_BODY(getaddrinfo_test, tc)
 {
 
 	RUN_TESTS(tc, METHOD_GETADDRINFO);
 }
 
-ATF_TC_WITHOUT_HEAD(gethostby_test);
+ATF_TC(gethostby_test);
+ATF_TC_HEAD(gethostby_test, tc) {
+	atf_tc_set_md_var(tc, "timeout", "450");
+}
 ATF_TC_BODY(gethostby_test, tc)
 {
 
 	RUN_TESTS(tc, METHOD_GETHOSTBY);
 }
 
-ATF_TC_WITHOUT_HEAD(getipnodeby_test);
+ATF_TC(getipnodeby_test);
+ATF_TC_HEAD(getipnodeby_test, tc) {
+
+	atf_tc_set_md_var(tc, "timeout", "450");
+}
 ATF_TC_BODY(getipnodeby_test, tc)
 {