public/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-08-08 00:18:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

servertest: drop duplicate not-found tests and use the shared client helper

Browse Source 
The per-resource tests already assert the DeleteNode/DeleteUser/RenameUser/
ExpireApiKey/DeleteApiKey 404s; keep only the cases unique to the error
file. TestAPIv1_Health now uses apiClient like the rest.
This commit is contained in:
Kristoffer Dalby
2026-06-18 12:26:30 +00:00
parent a707201ec3
commit a22fec9ce1
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hscontrol/servertest/apiv1_errors_test.go
+5 -29
View File
@@ -8,8 +8,11 @@ import (
apiv1 "github.com/juanfont/headscale/gen/api/v1"
)
// The not-found cases below exercise the gRPC->HTTP error translation: a state
// "record not found" must surface as an RFC 7807 404, not a 500 or a success.
// These cases assert the HTTP error translation for paths that the
// per-resource happy-path tests do not already cover; they are the ones that
// caught the RenameNode/ExpireNode 500 and the pre-auth-key silent-success bugs.
// Not-found cases that the per-resource tests already assert (DeleteNode,
// DeleteUser, RenameUser, ExpireApiKey, DeleteApiKey) live there, not here.
func TestAPIv1_Nodes_NotFound(t *testing.T) {
_, client := apiClient(t)
@@ -17,8 +20,6 @@ func TestAPIv1_Nodes_NotFound(t *testing.T) {
const missing = uint64(99999)
requireProblem(t, client.DeleteNode(ctx, apiv1.DeleteNodeParams{NodeID: missing}), http.StatusNotFound)
_, err := client.RenameNode(ctx, apiv1.RenameNodeParams{NodeID: missing, NewName: "x"})
requireProblem(t, err, http.StatusNotFound)
@@ -26,31 +27,6 @@ func TestAPIv1_Nodes_NotFound(t *testing.T) {
requireProblem(t, err, http.StatusNotFound)
}
func TestAPIv1_Users_NotFound(t *testing.T) {
_, client := apiClient(t)
ctx := context.Background()
const missing = uint64(99999)
requireProblem(t, client.DeleteUser(ctx, apiv1.DeleteUserParams{ID: missing}), http.StatusNotFound)
_, err := client.RenameUser(ctx, apiv1.RenameUserParams{OldID: missing, NewName: "x"})
requireProblem(t, err, http.StatusNotFound)
}
func TestAPIv1_ApiKeys_NotFound(t *testing.T) {
_, client := apiClient(t)
ctx := context.Background()
requireProblem(t, client.ExpireApiKey(ctx, &apiv1.ExpireApiKeyReq{
ID: apiv1.NewOptUint64(99999),
}), http.StatusNotFound)
requireProblem(t, client.DeleteApiKey(ctx, apiv1.DeleteApiKeyParams{
Prefix: "nonexistent",
}), http.StatusNotFound)
}
func TestAPIv1_PreAuthKeys_Errors(t *testing.T) {
_, client := apiClient(t)
ctx := context.Background()
hscontrol/servertest/apiv1_health_test.go
+2 -3
View File
@@ -15,8 +15,7 @@ import (
// talks to the ogen-generated server in-process and gets a healthy response
// reporting database connectivity.
func TestAPIv1_Health(t *testing.T) {
srv := servertest.NewServer(t)
client := srv.APIClient(t, srv.CreateAPIKey(t))
_, client := apiClient(t)
resp, err := client.Health(context.Background())
require.NoError(t, err)
@@ -29,7 +28,7 @@ func TestAPIv1_Health(t *testing.T) {
// TestAPIv1_Health_Unauthorized verifies the bearer-auth SecurityHandler:
// an invalid API key yields a 401 RFC 7807 problem, matching the previous
// gRPC/gateway behaviour of rejecting bad tokens.
// behaviour of rejecting bad tokens.
func TestAPIv1_Health_Unauthorized(t *testing.T) {
srv := servertest.NewServer(t)
client := srv.APIClient(t, "tskey-invalid")