fix toolsdk testmain

johnstcn · johnstcn · commit ae06274c95cd · 2025-04-11T09:37:43.000+01:00
diff --git a/codersdk/toolsdk/toolsdk.go b/codersdk/toolsdk/toolsdk.go
@@ -32,22 +32,25 @@ func (t Tool[T]) Generic() Tool[any] {
 }
 
 var (
+	// All is a list of all tools that can be used in the Coder CLI.
+	// When you add a new tool, be sure to include it here!
 	All = []Tool[any]{
-		ReportTask.Generic(),
+		CreateTemplateVersion.Generic(),
+		CreateTemplate.Generic(),
 		CreateWorkspace.Generic(),
+		CreateWorkspaceBuild.Generic(),
+		DeleteTemplate.Generic(),
+		GetAuthenticatedUser.Generic(),
+		GetTemplateVersionLogs.Generic(),
+		GetWorkspace.Generic(),
+		GetWorkspaceAgentLogs.Generic(),
+		GetWorkspaceBuildLogs.Generic(),
 		ListWorkspaces.Generic(),
 		ListTemplates.Generic(),
 		ListTemplateVersionParameters.Generic(),
-		GetAuthenticatedUser.Generic(),
-		CreateWorkspaceBuild.Generic(),
+		ReportTask.Generic(),
 		UploadTarFile.Generic(),
-		CreateTemplateVersion.Generic(),
-		CreateTemplate.Generic(),
-		GetTemplateVersionLogs.Generic(),
 		UpdateTemplateActiveVersion.Generic(),
-		DeleteTemplate.Generic(),
-		GetWorkspaceAgentLogs.Generic(),
-		GetWorkspaceBuildLogs.Generic(),
 	}
 
 	ReportTask = Tool[string]{
diff --git a/codersdk/toolsdk/toolsdk_test.go b/codersdk/toolsdk/toolsdk_test.go
@@ -329,18 +329,25 @@ var testedTools sync.Map
 // testTool is a helper function to test a tool and mark it as tested.
 func testTool[T any](ctx context.Context, t *testing.T, tool toolsdk.Tool[T], args map[string]any) (T, error) {
 	t.Helper()
-	testedTools.Store(tool.Tool.Name, struct{}{})
+	testedTools.Store(tool.Tool.Name, true)
 	result, err := tool.Handler(ctx, args)
 	return result, err
 }
 
 // TestMain runs after all tests to ensure that all tools in this package have
 // been tested once.
 func TestMain(m *testing.M) {
+	// Initialize testedTools
+	for _, tool := range toolsdk.All {
+		testedTools.Store(tool.Tool.Name, false)
+	}
+
 	code := m.Run()
+
+	// Ensure all tools have been tested
 	var untested []string
 	for _, tool := range toolsdk.All {
-		if _, ok := testedTools.Load(tool.Tool.Name); !ok {
+		if tested, ok := testedTools.Load(tool.Tool.Name); !ok || !tested.(bool) {
 			untested = append(untested, tool.Tool.Name)
 		}
 	}
