r3350 - in branches/nuke/varnish-cache/bin/varnishtest: . tests

[sky at projects.linpro.no]

Author: sky
Date: 2008-10-26 20:04:51 +0100 (Sun, 26 Oct 2008)
New Revision: 3350

Modified:
   branches/nuke/varnish-cache/bin/varnishtest/tests/v00017.vtc
   branches/nuke/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
my bad, the problem is an excessive search list on my laptop; appending a . to the domain name terminates that search; reverting #3349

Modified: branches/nuke/varnish-cache/bin/varnishtest/tests/v00017.vtc
===================================================================
--- branches/nuke/varnish-cache/bin/varnishtest/tests/v00017.vtc	2008-10-26 18:48:32 UTC (rev 3349)
+++ branches/nuke/varnish-cache/bin/varnishtest/tests/v00017.vtc	2008-10-26 19:04:51 UTC (rev 3350)
@@ -34,7 +34,7 @@
 
 varnish v1 -badvcl {
 	backend b { .host = "127.0.0.1"; }
-	acl a { "en.lille.nisse.rejste"; }
+	acl a { "en.lille.nisse.rejste."; }
 	sub vcl_recv { if (client.ip ~ a) { pass; } }
 }
 
@@ -60,8 +60,8 @@
 	backend b { .host = "127.0.0.1"; }
 	acl a {
 		! "10.1.3"; 
-		("en.lille.nisse.rejste" / 22); 
-		(!"en.lille.nisse.rejste"); 
+		("en.lille.nisse.rejste." / 22); 
+		(!"en.lille.nisse.rejste."); 
 	}
 	sub vcl_recv { if (client.ip ~ a) { pass; } }
 }

Modified: branches/nuke/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- branches/nuke/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-10-26 18:48:32 UTC (rev 3349)
+++ branches/nuke/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-10-26 19:04:51 UTC (rev 3350)
@@ -93,7 +93,7 @@
 	assert(i == strlen(cmd));
 	i = write(v->cli_fd, "\n", 1);
 	assert(i == 1);
-	i = cli_readres(v->cli_fd, &retval, &r, 60.0);
+	i = cli_readres(v->cli_fd, &retval, &r, 10.0);
 	assert(i == 0);
 	vtc_dump(v->vl, 4, "CLI RX", r);
 	vtc_log(v->vl, 3, "CLI STATUS %u", retval);