Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: upgrade Go to 1.27 (#30601)

Browse source
This commit is contained in:
andig 2026-08-20 13:36:53 +02:00 • committed by GitHub
parent 748d36d130
commit e63bae0c8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
37 changed files with 135 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

8
charger/evsewifi_test.go
View file

@ -10,10 +10,10 @@ import (
)
func TestEvseWifi(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ts := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, _ = fmt.Fprintln(w, `{"list":[{"useMeter":true, "alwaysActive":true}]}`)
}))
defer ts.Close()
ts.Start()
wb, err := NewEVSEWifiFromConfig(map[string]any{
"uri": ts.URL,
@ -46,10 +46,10 @@ func TestEvseWifi(t *testing.T) {
}
func TestEvseWifiEx(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ts := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
_, _ = fmt.Fprintln(w, `{"list":[{"actualCurrentMA":600, "alwaysActive":true}]}`)
}))
defer ts.Close()
ts.Start()
wb, err := NewEVSEWifiFromConfig(map[string]any{
"uri": ts.URL,

12
charger/ghostone/identity_test.go
View file

@ -16,13 +16,11 @@ import (
func TestTokenSource_ContextCancellation(t *testing.T) {
// server that blocks -- simulates slow/unreachable wallbox
unblock := make(chan struct{})
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
srv := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
<-unblock
}))
defer func() {
close(unblock)
srv.Close()
}()
srv.StartTLS()
defer close(unblock)
log := util.NewLogger("test")
@ -40,12 +38,12 @@ func TestTokenSource_ContextCancellation(t *testing.T) {
func TestTokenSource_Success(t *testing.T) {
// server that returns a valid JWT-style token
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
srv := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Authorization", fmt.Sprintf("Bearer %s",
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwiZXhwIjo5OTk5OTk5OTk5fQ.signature"))
w.WriteHeader(http.StatusOK)
}))
defer srv.Close()
srv.StartTLS()
log := util.NewLogger("test")

6
charger/go-e/api_test.go
View file

@ -34,7 +34,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func TestLocalV1(t *testing.T) {
h := &handler{}
srv := httptest.NewServer(h)
srv := httptest.NewTestServer(t, h)
srv.Start()
// h.expect("/api/status?filter=alw")
local := NewLocal(util.NewLogger("foo"), srv.URL, 0)
@ -52,7 +53,8 @@ func TestLocalV1(t *testing.T) {
func TestLocalV2(t *testing.T) {
h := &handler{}
srv := httptest.NewServer(h)
srv := httptest.NewTestServer(t, h)
srv.Start()
h.expect("/api/status?filter=alw")
local := NewLocal(util.NewLogger("foo"), srv.URL, 0)

9
charger/go-e_test.go
View file

@ -33,7 +33,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func TestGoEV1(t *testing.T) {
srv := httptest.NewServer(new(handler))
srv := httptest.NewTestServer(t, new(handler))
srv.Start()
sponsor.Subject = "foo"
@ -56,8 +57,10 @@ func TestGoEV1(t *testing.T) {
}
func TestGoEV2(t *testing.T) {
srv := httptest.NewServer(new(handler))
srv.Config.Handler.(*handler).expect("/api/status?filter=alw")
h := new(handler)
srv := httptest.NewTestServer(t, h)
srv.Start()
h.expect("/api/status?filter=alw")
sponsor.Subject = "foo"

8
charger/ocpp/forwarder_test.go
View file

@ -109,7 +109,7 @@ func TestForwarderUpstreamReconnect(t *testing.T) {
var conns atomic.Int32
frames := make(chan []byte, 1)
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
srv := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := websocket.Accept(w, r, &websocket.AcceptOptions{Subprotocols: []string{"ocpp1.6"}})
if err != nil {
return
@ -127,7 +127,7 @@ func TestForwarderUpstreamReconnect(t *testing.T) {
}
c.CloseNow()
}))
defer srv.Close()
srv.Start()
cleanup := forwarderTestSetup(t, id)
defer cleanup()
@ -144,7 +144,7 @@ func TestForwarderDialRetry(t *testing.T) {
var reqs atomic.Int32
frames := make(chan []byte, 1)
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
srv := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if reqs.Add(1) <= 2 {
// reject the websocket upgrade to simulate an unreachable upstream
http.Error(w, "unavailable", http.StatusServiceUnavailable)
@ -162,7 +162,7 @@ func TestForwarderDialRetry(t *testing.T) {
}
c.CloseNow()
}))
defer srv.Close()
srv.Start()
cleanup := forwarderTestSetup(t, id)
defer cleanup()

32
charger/semp_test.go
View file

@ -251,8 +251,8 @@ func TestSEMPCharger(t *testing.T) {
planningResponse: mockPlanningRequestResponse,
infoResponse: mockDeviceInfoResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()
@ -318,8 +318,8 @@ func TestSEMPChargerOff(t *testing.T) {
planningResponse: mockEmptyPlanningRequestResponse,
infoResponse: mockDeviceInfoResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()
@ -353,8 +353,8 @@ func TestSEMPChargerDeviceNotFound(t *testing.T) {
planningResponse: mockPlanningRequestResponse,
infoResponse: mockDeviceInfoResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
// NewSEMP now calls Enabled() which will fail if device is not found
_, err := NewSEMP(t.Context(), server.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second)
@ -368,8 +368,8 @@ func TestSEMPChargerReady(t *testing.T) {
planningResponse: mockPlanningRequestResponse,
infoResponse: mockDeviceInfoResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()
@ -396,8 +396,8 @@ func TestSEMPChargerPhases1p3p(t *testing.T) {
planningResponse: mockPlanningRequestResponse,
infoResponse: mockDeviceInfoPhases1p3pResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()
@ -440,8 +440,8 @@ func TestSEMPChargerChargedEnergy(t *testing.T) {
infoResponse: mockDeviceInfoResponse,
parametersResponse: mockParametersResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()
@ -465,8 +465,8 @@ func TestSEMPChargerChargedEnergy(t *testing.T) {
infoResponse: mockDeviceInfoResponse,
// parametersResponse left empty
}
server2 := httptest.NewServer(handler2)
defer server2.Close()
server2 := httptest.NewTestServer(t, handler2)
server2.Start()
wb2, err := NewSEMP(t.Context(), server2.URL+"/semp", "F-12345678-ABCDEF123456-00", time.Second)
require.NoError(t, err)
@ -483,8 +483,8 @@ func TestSEMPChargerAutoDetectDeviceID(t *testing.T) {
planningResponse: mockPlanningRequestResponse,
infoResponse: mockDeviceInfoResponse,
}
server := httptest.NewServer(handler)
defer server.Close()
server := httptest.NewTestServer(t, handler)
server.Start()
ctx := t.Context()

13
charger/trydan_test.go
View file

@ -20,10 +20,13 @@ func withSponsor(t *testing.T) {
t.Cleanup(func() { sponsor.Subject = orig })
}
func trydanTestServerWithBody(body string) *httptest.Server {
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
func trydanTestServerWithBody(t *testing.T, body string) *httptest.Server {
t.Helper()
srv := httptest.NewTestServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, body)
}))
srv.Start()
return srv
}
// ChargeState maps directly to api.ChargeStatus, except firmware 2.5.0 keeps it at
@ -47,8 +50,7 @@ func TestTrydanStatus(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
srv := trydanTestServerWithBody(tc.json)
defer srv.Close()
srv := trydanTestServerWithBody(t, tc.json)
wb, err := NewTrydan(srv.URL, 0)
if err != nil {
@ -107,8 +109,7 @@ func TestTrydanPhaseMeasurementsUnavailable(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
srv := trydanTestServerWithBody(tc.json)
defer srv.Close()
srv := trydanTestServerWithBody(t, tc.json)
wb, err := NewTrydan(srv.URL, 0)
if err != nil {