From e711b9754b6c25633db6fd67ebc004c3a4573359 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 18 Dec 2023 14:46:56 -0800
Subject: [PATCH] fix 1 race

---
 e2etests-cli/concurrent_buf.go                |  26 ++++++++++++++++++
 e2etests-cli/main_test.go                     |  18 ++++++------
 .../TestCLI_E2E/internal_linked_pdf.exp.pdf   | Bin 66069 -> 66069 bytes
 .../testdata/TestCLI_E2E/no-nav-pdf.exp.pdf   | Bin 96035 -> 96035 bytes
 .../testdata/TestCLI_E2E/no-nav-pptx.exp.pptx | Bin 122134 -> 122135 bytes
 .../TestCLI_E2E/renamed-board.exp.pdf         | Bin 109973 -> 109973 bytes
 6 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 e2etests-cli/concurrent_buf.go

diff --git a/e2etests-cli/concurrent_buf.go b/e2etests-cli/concurrent_buf.go
new file mode 100644
index 0000000000..7474e9d5ed
--- /dev/null
+++ b/e2etests-cli/concurrent_buf.go
@@ -0,0 +1,26 @@
+package e2etests_cli
+
+import "sync"
+
+// stderrWrapper lets stderr be read/write concurrently
+type stderrWrapper struct {
+	msg string
+	m   sync.Mutex
+}
+
+func (e *stderrWrapper) Write(p []byte) (n int, err error) {
+	e.m.Lock()
+	defer e.m.Unlock()
+	e.msg += string(p)
+	return len(p), nil
+}
+
+func (e *stderrWrapper) Reset() {
+	e.msg = ""
+}
+
+func (e *stderrWrapper) Read() string {
+	e.m.Lock()
+	defer e.m.Unlock()
+	return e.msg
+}
diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go
index 8da9444b29..a47f2f8191 100644
--- a/e2etests-cli/main_test.go
+++ b/e2etests-cli/main_test.go
@@ -881,7 +881,7 @@ layers: {
         c -> b
     }
 }`)
-				stderr := &bytes.Buffer{}
+				stderr := &stderrWrapper{}
 				tms := testMain(dir, env, "--watch", "--browser=0", "index.d2")
 				tms.Stderr = stderr
 
@@ -935,7 +935,7 @@ layers: {
         c -> b
     }
 }`)
-				stderr := &bytes.Buffer{}
+				stderr := &stderrWrapper{}
 				tms := testMain(dir, env, "--watch", "--browser=0", "index.d2")
 				tms.Stderr = stderr
 
@@ -988,7 +988,7 @@ layers: {
         c -> b
     }
 }`)
-				stderr := &bytes.Buffer{}
+				stderr := &stderrWrapper{}
 				tms := testMain(dir, env, "--watch", "--browser=0", "index.d2")
 				tms.Stderr = stderr
 
@@ -1036,7 +1036,7 @@ layers: {
 				writeFile(t, dir, "b.d2", `
 x
 `)
-				stderr := &bytes.Buffer{}
+				stderr := &stderrWrapper{}
 				tms := testMain(dir, env, "--watch", "--browser=0", "a.d2")
 				tms.Stderr = stderr
 
@@ -1202,26 +1202,26 @@ func getNumBoards(svg string) int {
 
 var errRE = regexp.MustCompile(`err:`)
 
-func waitLogs(ctx context.Context, buf *bytes.Buffer, pattern *regexp.Regexp) (string, error) {
+func waitLogs(ctx context.Context, stream *stderrWrapper, pattern *regexp.Regexp) (string, error) {
 	ticker := time.NewTicker(10 * time.Millisecond)
 	defer ticker.Stop()
 	var match string
 	for i := 0; i < 1000 && match == ""; i++ {
 		select {
 		case <-ticker.C:
-			out := buf.String()
+			out := stream.Read()
 			match = pattern.FindString(out)
 			errMatch := errRE.FindString(out)
 			if errMatch != "" {
-				return "", errors.New(buf.String())
+				return "", errors.New(out)
 			}
 		case <-ctx.Done():
 			ticker.Stop()
-			return "", fmt.Errorf("could not match pattern in log. logs: %s", buf.String())
+			return "", fmt.Errorf("could not match pattern in log. logs: %s", stream.Read())
 		}
 	}
 	if match == "" {
-		return "", errors.New(buf.String())
+		return "", errors.New(stream.Read())
 	}
 
 	return match, nil
diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf
index a0e3775ea0dc24f8e134c6524cf32b466d3bd151..4cf0f8d375cf10f549fc44c635014860e5eaa480 100644
GIT binary patch
delta 62
zcmbQ*!ZNjmWy8b2lZE~nOuqluaI(|CtI8IJCMG7P#+qFEzWFIGi6yBD8ZK5w21dq)
OMut$i%~t<!GXVf8Sr*Fx

delta 62
zcmbQ*!ZNjmWy8b2lZF53Prm=xXtLA4tI8&ZW=5u_mYQ7pzWFIGi6yBD8ZK5w21dq)
OMut$i%~t<!GXVf8*%s0O

diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf
index dca9087ff1cacd46e85fd76f954fb0ef9b0e8640..0c8250ecc5433ced4e94f68666f52a827575e8c7 100644
GIT binary patch
delta 182
zcmZ4dj&<=n)(zrPQ};41n!H<zZ+k8y;|>4G_G=7)BFfum1Tu;!PVHqhn4G^xW$FXQ
z!pUo-_!&($?~!VrINddn(O`4_8o7|^Yl;}}Ga66tDP}ZeG@QP#m@!@1!qCLT#MDTW
zOW!v?#U-&MRYAkW%E-XT*wDxjD!1LEgwd2q*T~$+(nP@k1QhZVxWEi!QwtMQG%<5y
MV*|_StI8NF0jB*oLjV8(

delta 180
zcmZ4dj&<=n)(zrP)BEHYRVGLEG)&$p#kcuIPuaxD^Ro=L14ZRRCbRVzOg^8bJlRUB
ze)6pzzRky_Zun1+lVdd4d_K!uar&Af#`}zh(|d{;4H=E6?<;0ZS2i&;Gcq+b(d5$i
z%};SjEJ;<+aIrEnFfukYGK9))_b6dBWzsb<F|agIFaQCCJOwT=!_3so+zd_3!pzvj
KVEU>u#!3JV6gWiy

diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx
index b84b1fd4367b68abda1e6ca10f3feba889af6b87..0d0f5f7cc2b57084d8e9d765205b9e6a30a5b645 100644
GIT binary patch
delta 472
zcmV;}0Vn>Jx(AoK2Y|Ez7RP_jZreN%#P4|uf_I6M?C*m?*b2}FIW<6lx@fN~xsloM
zAINniy?r6NV&XKn9v3t7;|?k9ZzpTW3&f<oJJ7anC;=zE(r!4=Z^!#;M@d5AlrY}G
zfzFWVZGW?uflD9ZG5P=zHKZFt2$`&LiOX=HC&a)ROY#I(q}m5?lQn-&K3ajP_HkfA
z$Y(JC>zd|&W&wo~DA)q6LZQ+(SS1TKoTJGQB^em7;4rbaZW%3JglN-;fvm7=veh^T
z_|U$JSBWX<Vjjn_9yi(EHBHNYJbd|@YggJWS0{n?Il5PpqecV0KjWU2sfg+P^A|`g
z@;VoTj3Cg*UKp5!QxJbg;f8Eom5Wsd{tWZzqe_Im#uX$PbwKT1{}>^GL$M5G00&VZ
zC^Bk1k-LsmWNDW;W2!U44Yl+(AM}<{4l^R*gID@VgZebTU+-^22}XF)%cs}3*;dAN
z<@{Eca-hhRG{3yls(jykzB}I2zH7Qo)pk|8JGNWC-SYpMs@W~^rdf8rg1kf9KTG`^
zd!@V<lLBGzabB)JSG)dO`riQn0RR6`O9u#jE)zMUx4*~%)Ds1LE)zMUmzdlEQ~}4A
O?c4z)1}Mt`00006+v2(a

delta 471
zcmV;|0Vw{Lx(AlJ2Y|Ez7RP^2PuwsN#qWFy%lE`d77(&_gVZ8UMMCOU?bWr1tc(B2
zo+Zh*ui|YCOSy3zz4v~eXD8d+$r|zkF=_91w5=OTz)7#P8+P=^{=T}QB%yFh81G<5
zXGrw6zu3yarH}9!eSnA>(gh)eOxC!>W!TXJV&IG=c>pU??E|>UnkRoBt-w_KIItk(
zvlxJNO>@mGpilw@TcA}aRQd+1WWk1GG#R2K0|OQuCf3$1qs5C5ZTc{f6?RUx8s`8X
z+E?)`F(qBh<2csiCfmEFY1yxbZ{Kt6O1tIiB+x!bw@Px<XrT8;+_EwiF&%&Z0f|Lk
z=VFi%1p3$u1CwwH;wXRIkgcn7vdX}pVIF-{iLlqWf+V93sJ-hSBP4JrmVpf5APNLU
zMvVt@*O7`W?Gk59bw;?Mmfq%r-ZIKzMkIXjN<V2(U*`Ag{ckA22rqj1^!hg2%DAqa
z-|AEj6q%Cdr*~SFpPR3D`+M4VO}DAqu4*s$?KSVN_|;|A-0&=>S#~~yyhGc6OMQ;L
zQeKNmfiU<uFV~-|o&PQU-v9sr|Nl@+2M7kyl;Wbdz{mmA69op*l;Wb7ncM+X0mhf^
N+yNs7C(8i<003Ry>xBRS

diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf
index bc31d49cd3d863358f9f23a3a54cb66991b2cd10..fc1d6dc01eb1c900b05be9628efdeb77299e58c4 100644
GIT binary patch
delta 68
zcmbPwn{DcCwuUW?msU<^S;c5D{lZE{qv<BA7?YGO3{6Z-Obs=;^nLSFToOxC6*OF|
Uj0}v74UG(;a@%*VV!Xoy08KU)K>z>%

delta 68
zcmbPwn{DcCwuUW?msU<^S;c5D{lZE{qv<BA7?YGu49$#8O-(ep^nLSFToOxC6*OF|
Uj0}v74UG(;a@%*VV!Xoy08I`SK>z>%