TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-19 09:30:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

types/lazy: re-init SyncValue during test cleanup if it wasn't set before SetForTest

Browse Source 
Updates #12687

Signed-off-by: Nick Khyl <nickk@tailscale.com>
This commit is contained in:
Nick Khyl
2024-07-23 19:34:03 -05:00
committed by Nick Khyl
parent ba7f2d129e
commit 43375c6efb
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
types/lazy/lazy.go
View File

@@ -170,8 +170,8 @@ type TB interface {
func (z *SyncValue[T]) SetForTest(tb TB, val T, err error) {
tb.Helper()
z.once.Do(func() {})
oldErr, oldVal := z.err.Load(), z.v
z.once.Do(func() {})
z.v = val
if err != nil {
@@ -181,7 +181,11 @@ func (z *SyncValue[T]) SetForTest(tb TB, val T, err error) {
}
tb.Cleanup(func() {
z.v = oldVal
z.err.Store(oldErr)
if oldErr == nil {
*z = SyncValue[T]{}
} else {
z.v = oldVal
z.err.Store(oldErr)
}
})
}