Merge pull request cloudflare#583 from cloudflare/tests

Cleanup tests
linode-obs · Mar 20, 2023 · 00b5164 · 00b5164
2 parents f02d2be + dc1d265
commit 00b5164
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 39 deletions.
diff --git a/internal/reporter/bitbucket_test.go b/internal/reporter/bitbucket_test.go
@@ -19,13 +19,6 @@ import (
 	"github.com/cloudflare/pint/internal/reporter"
 )
 
-func blameLine(sha string, line int, filename, content string) string {
-	return fmt.Sprintf(`%s %d %d 1
-filename %s
-	%s
-`, sha, line, line, filename, content)
-}
-
 func TestBitBucketReporter(t *testing.T) {
 	zerolog.SetGlobalLevel(zerolog.FatalLevel)
 
@@ -71,10 +64,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 2, "foo.txt", "up == 0")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{
@@ -103,10 +92,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 2, "foo.txt", "up == 0")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{
@@ -137,10 +122,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 2, "foo.txt", "up == 0")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{
@@ -171,10 +152,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 2, "foo.txt", "up == 0") + blameLine("fake-commit-id", 4, "foo.txt", "errors")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{
@@ -299,14 +276,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-00", 1, "foo.txt", "ignore") +
-						blameLine("fake-commit-00", 2, "foo.txt", "ignore") +
-						blameLine("fake-commit-id", 3, "foo.txt", "ok") +
-						blameLine("fake-commit-id", 4, "foo.txt", "syntax error") +
-						blameLine("fake-commit-01", 5, "foo.txt", "ignore")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{
@@ -363,10 +332,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 2, "foo.txt", "up == 0") + blameLine("fake-commit-id", 4, "foo.txt", "errors")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			report: reporter.BitBucketReport{
@@ -396,10 +361,6 @@ func TestBitBucketReporter(t *testing.T) {
 				if args[0] == "rev-parse" {
 					return []byte("fake-commit-id"), nil
 				}
-				if args[0] == "blame" {
-					content := blameLine("fake-commit-id", 4, "foo.txt", "errors")
-					return []byte(content), nil
-				}
 				return nil, nil
 			},
 			reports: []reporter.Report{

diff --git a/internal/reporter/github_test.go b/internal/reporter/github_test.go
@@ -41,6 +41,13 @@ func TestGithubReporter(t *testing.T) {
   expr: sum(errors) by (job)
 `))
 
+	blameLine := func(sha string, line int, filename, content string) string {
+		return fmt.Sprintf(`%s %d %d 1
+filename %s
+	%s
+`, sha, line, line, filename, content)
+	}
+
 	for _, tc := range []testCaseT{
 		{
 			description: "timeout errors out",