From 1bb7172515edd6197ec1fa00c715310af1bd17a7 Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Tue, 13 Aug 2024 16:26:08 +0200 Subject: [PATCH] Fix api_test.go under Go 1.20. --- webserver/api_test.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/webserver/api_test.go b/webserver/api_test.go index 0832ad7..e26c3f1 100644 --- a/webserver/api_test.go +++ b/webserver/api_test.go @@ -18,16 +18,20 @@ import ( "github.com/jech/galene/token" ) -var setupOnce = sync.OnceFunc(func() { - Insecure = true - err := Serve("localhost:1234", "") - if err != nil { - panic("could not start server") - } -}) +var setupOnce sync.Once + +func setup() { + setupOnce.Do(func() { + Insecure = true + err := Serve("localhost:1234", "") + if err != nil { + panic("could not start server") + } + }) +} func setupTest(dir, datadir string) error { - setupOnce() + setup() group.Directory = dir group.DataDirectory = datadir