[master] 76c740f More curses test-tweaking

Poul-Henning Kamp phk at FreeBSD.org
Fri Jan 12 19:31:06 UTC 2018


commit 76c740f57a2113275abaea9a5a5d425263629cc6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Jan 12 19:30:30 2018 +0000

    More curses test-tweaking

diff --git a/bin/varnishtest/tests/u00010.vtc b/bin/varnishtest/tests/u00010.vtc
index 4822a78..a143c72 100644
--- a/bin/varnishtest/tests/u00010.vtc
+++ b/bin/varnishtest/tests/u00010.vtc
@@ -18,4 +18,4 @@ client c1 {
 	rxresp
 } -run
 
-process p1 -need-bytes 1000 -screen_dump -write {q} -wait
+process p1 -need-bytes 500 -screen_dump -write {q} -wait
diff --git a/bin/varnishtest/tests/u00011.vtc b/bin/varnishtest/tests/u00011.vtc
index 378c22d..38e57f0 100644
--- a/bin/varnishtest/tests/u00011.vtc
+++ b/bin/varnishtest/tests/u00011.vtc
@@ -20,8 +20,6 @@ client c1 {
 
 process p1 -writeln {panic.show}
 
-process p1 -writeln {quit}
-
 process p1 -need-bytes 400
 
 process p1 -screen_dump -write "quit\r" -wait
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 9a06e95..180f0d4 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -714,11 +714,11 @@ cmd_process(CMD_ARGS)
 			u = strtoumax(av[1], NULL, 0);
 			av++;
 			do {
-				usleep(500000);
 				AZ(pthread_mutex_lock(&p->mtx));
 				v = p->stdout_bytes;
 				AZ(pthread_mutex_unlock(&p->mtx));
 				vtc_log(p->vl, 4, "Have %ju bytes", v);
+				usleep(500000);
 			} while(v < u);
 			continue;
 		}


More information about the varnish-commit mailing list