revert: show chores in release notes (#2601)

This partially reverts commit 88b62cc.
It keeps the tests but updates the want to not show a chore.

Author: codyoss

internal/librarian/generate_command_test.go

@@ -877,7 +877,7 @@ func TestGenerateScenarios(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			repo := newTestGitRepoWithState(t, test.state, true)
+			repo := newTestGitRepoWithState(t, test.state)
 
 			r := &generateRunner{
 				api:             test.api,
@@ -1005,7 +1005,7 @@ func TestGenerateSingleLibraryCommand(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			repo := newTestGitRepoWithState(t, test.state, true)
+			repo := newTestGitRepoWithState(t, test.state)
 			sourceRepo := newTestGitRepo(t)
 			r := &generateRunner{
 				api:             test.api,

internal/librarian/librarian_test.go

@@ -244,11 +244,11 @@ func newTestGitRepo(t *testing.T) gitrepo.Repository {
 			},
 		},
 	}
-	return newTestGitRepoWithState(t, defaultState, true)
+	return newTestGitRepoWithState(t, defaultState)
 }
 
 // newTestGitRepo creates a new git repository in a temporary directory.
-func newTestGitRepoWithState(t *testing.T, state *config.LibrarianState, writeState bool) gitrepo.Repository {
+func newTestGitRepoWithState(t *testing.T, state *config.LibrarianState) gitrepo.Repository {
 	t.Helper()
 	dir := t.TempDir()
 	remoteURL := "https://github.com/googleapis/librarian.git"
@@ -258,40 +258,39 @@ func newTestGitRepoWithState(t *testing.T, state *config.LibrarianState, writeSt
 	if err := os.WriteFile(filepath.Join(dir, "README.md"), []byte("test"), 0644); err != nil {
 		t.Fatalf("os.WriteFile: %v", err)
 	}
-	if writeState {
-		// Create a state.yaml and config.yaml file in .librarian dir.
-		librarianDir := filepath.Join(dir, config.LibrarianDir)
-		if err := os.MkdirAll(librarianDir, 0755); err != nil {
-			t.Fatalf("os.MkdirAll: %v", err)
-		}
+	// Create a state.yaml and config.yaml file in .librarian dir.
+	librarianDir := filepath.Join(dir, config.LibrarianDir)
+	if err := os.MkdirAll(librarianDir, 0755); err != nil {
+		t.Fatalf("os.MkdirAll: %v", err)
+	}
 
-		// Setup each source root directory to be non-empty (one `random_file.txt`)
-		// that can be used to test preserve or remove regex patterns
-		for _, library := range state.Libraries {
-			for _, sourceRoot := range library.SourceRoots {
-				fullPath := filepath.Join(dir, sourceRoot, "random_file.txt")
-				if err := os.MkdirAll(filepath.Dir(fullPath), 0755); err != nil {
-					t.Fatal(err)
-				}
-				if _, err := os.Create(fullPath); err != nil {
-					t.Fatal(err)
-				}
+	// Setup each source root directory to be non-empty (one `random_file.txt`)
+	// that can be used to test preserve or remove regex patterns
+	for _, library := range state.Libraries {
+		for _, sourceRoot := range library.SourceRoots {
+			fullPath := filepath.Join(dir, sourceRoot, "random_file.txt")
+			if err := os.MkdirAll(filepath.Dir(fullPath), 0755); err != nil {
+				t.Fatal(err)
+			}
+			if _, err := os.Create(fullPath); err != nil {
+				t.Fatal(err)
 			}
 		}
+	}
 
-		bytes, err := yaml.Marshal(state)
-		if err != nil {
-			t.Fatalf("yaml.Marshal() = %v", err)
-		}
-		stateFile := filepath.Join(librarianDir, "state.yaml")
-		if err := os.WriteFile(stateFile, bytes, 0644); err != nil {
-			t.Fatalf("os.WriteFile: %v", err)
-		}
-		configFile := filepath.Join(librarianDir, "config.yaml")
-		if err := os.WriteFile(configFile, []byte{}, 0644); err != nil {
-			t.Fatalf("os.WriteFile: %v", err)
-		}
+	bytes, err := yaml.Marshal(state)
+	if err != nil {
+		t.Fatalf("yaml.Marshal() = %v", err)
+	}
+	stateFile := filepath.Join(librarianDir, "state.yaml")
+	if err := os.WriteFile(stateFile, bytes, 0644); err != nil {
+		t.Fatalf("os.WriteFile: %v", err)
+	}
+	configFile := filepath.Join(librarianDir, "config.yaml")
+	if err := os.WriteFile(configFile, []byte{}, 0644); err != nil {
+		t.Fatalf("os.WriteFile: %v", err)
 	}
+
 	runGit(t, dir, "add", ".")
 	runGit(t, dir, "commit", "-m", "initial commit")
 	runGit(t, dir, "remote", "add", "origin", remoteURL)

internal/librarian/release_notes.go

@@ -53,7 +53,6 @@ var (
 		"perf",
 		"revert",
 		"docs",
-		"chore",
 	}
 
 	shortSHA = func(sha string) string {

internal/librarian/release_notes_test.go

@@ -352,10 +352,6 @@ Language Image: go:1.21
 
 ## [1.1.0](https://github.com/owner/repo/compare/my-library-1.0.0...my-library-1.1.0) (%s)
 
-### Miscellaneous Chores
-
-* some chore ([12345678](https://github.com/owner/repo/commit/12345678))
-
 </details>`,
 				librarianVersion, today),
 		},

internal/librarian/update_image_test.go

@@ -688,7 +688,7 @@ func TestUpdateImageRunnerRun(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			testRepo := newTestGitRepoWithState(t, test.state, true)
+			testRepo := newTestGitRepoWithState(t, test.state)
 			repo := &MockRepository{
 				Dir: testRepo.GetDir(),
 				RemotesValue: []*gitrepo.Remote{