[master] baf60b4d2 Make c121.vtc robust against concurrent execution

[Nils Goroll]

commit baf60b4d2ef5f418e6ac470f3562e43c37e2ad44
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Jun 23 12:44:42 2023 +0200

    Make c121.vtc robust against concurrent execution
    
    this happened on one of the uplex linux vtesters which runs
    gcc and clang in parallel un-namespaced
    
    *    top   VTEST Abstract UDS backend: change path, drop poll
    **   top   === feature abstract_uds
    **** dT    0.004
    **   top   === server s1 -listen "@vtc.s1.sock" {
    **   s1    Starting server
    ---- s1    Server listen address (@vtc.s1.sock) cannot be resolved: bind(2)

diff --git a/bin/varnishtest/tests/c00121.vtc b/bin/varnishtest/tests/c00121.vtc
index 002a9aca5..d810306aa 100644
--- a/bin/varnishtest/tests/c00121.vtc
+++ b/bin/varnishtest/tests/c00121.vtc
@@ -2,7 +2,7 @@ varnishtest "Abstract UDS backend: change path, drop poll"
 
 feature abstract_uds
 
-server s1 -listen "@vtc.s1.sock" {
+server s1 -listen "@${vtcid}.s1.sock" {
 	non_fatal
 	timeout 3
 	loop 40 {
@@ -12,7 +12,7 @@ server s1 -listen "@vtc.s1.sock" {
 	}
 } -start
 
-server s2 -listen "@vtc.s2.sock" {
+server s2 -listen "@${vtcid}.s2.sock" {
 	non_fatal
 	timeout 3
 	loop 40 {
@@ -22,7 +22,7 @@ server s2 -listen "@vtc.s2.sock" {
 	}
 } -start
 
-varnish v1 -arg "-a @vtc.v1.sock" -vcl {
+varnish v1 -arg "-a @${vtcid}.v1.sock" -vcl {
 	probe default {
 		.window = 8;
 		.initial = 7;
@@ -30,7 +30,7 @@ varnish v1 -arg "-a @vtc.v1.sock" -vcl {
 		.interval = 0.1s;
 	}
 	backend s1 {
-		.path = "@vtc.s2.sock";
+		.path = "@${vtcid}.s2.sock";
 	}
 } -start
 
@@ -44,7 +44,7 @@ varnish v1 -vcl {
 		.interval = 0.1s;
 	}
 	backend s1 {
-		.path = "@vtc.s1.sock";
+		.path = "@${vtcid}.s1.sock";
 	}
 } -cliok "vcl.use vcl2" -cliok "vcl.discard vcl1"
 
@@ -52,7 +52,7 @@ delay 1
 
 varnish v1 -vcl {
 	backend s1 {
-		.path = "@vtc.s1.sock";
+		.path = "@${vtcid}.s1.sock";
 	}
 } -cliok "vcl.use vcl3" -cliok "vcl.discard vcl2"
 
@@ -69,7 +69,7 @@ server s1 -break {
 
 delay 1
 
-client c1 -connect "@vtc.v1.sock" {
+client c1 -connect "@${vtcid}.v1.sock" {
 	txreq -url /foo
 	rxresp
 	txreq -url /foo