Cleanup tests

factorial-io · Feb 26, 2025 · 372f755 · 372f755
1 parent 0c04c5b
commit 372f755
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/visitor.go b/visitor.go
@@ -155,7 +155,6 @@ func (w *Visitor) process(ctx context.Context, job *ctrlq.VisitJob) error {
 	jlogger.Debug("Visitor: URL visit failed, handling ...", "error", err)
 
 	code, herr := handleFailedVisit(
-		jctx,
 		func(url string, d time.Duration) error {
 			return w.queue.Pause(jctx, url, d)
 		},
@@ -203,7 +202,7 @@ func (w *Visitor) process(ctx context.Context, job *ctrlq.VisitJob) error {
 // One returns the status code indicating *how* and if the fail was handled. The other return value
 // is an error, if one occurred during handling. An error means the fail was not handled
 // properly.
-func handleFailedVisit(ctx context.Context, pause PauseFn, republish RepublishFn, job *ctrlq.VisitJob, res *collector.Response, err error) (Code, error) {
+func handleFailedVisit(pause PauseFn, republish RepublishFn, job *ctrlq.VisitJob, res *collector.Response, err error) (Code, error) {
 	attemptRepublish := func() (Code, error) {
 		if job.Retries >= MaxJobRetries {
 			return CodePermanent, fmt.Errorf("maximum retries reached")

diff --git a/visitor_test.go b/visitor_test.go
@@ -16,7 +16,7 @@ import (
 	"tobey/internal/ctrlq"
 )
 
-func createResponse(statusCode int, headers ...string) *collector.Response {
+func createTestResponse(statusCode int, headers ...string) *collector.Response {
 	var h *http.Header
 	if len(headers) > 0 {
 		if len(headers)%2 != 0 {
@@ -54,23 +54,23 @@ func TestHandleFailedVisit(t *testing.T) {
 	}{
 		{
 			name:            "301 redirect",
-			response:        createResponse(301),
+			response:        createTestResponse(301),
 			expectedCode:    CodeIgnore,
 			expectedError:   false,
 			expectPause:     false,
 			expectRepublish: false,
 		},
 		{
 			name:            "404 not found",
-			response:        createResponse(404),
+			response:        createTestResponse(404),
 			expectedCode:    CodeIgnore,
 			expectedError:   false,
 			expectPause:     false,
 			expectRepublish: false,
 		},
 		{
 			name:            "500 internal server error - first retry",
-			response:        createResponse(500),
+			response:        createTestResponse(500),
 			retries:         0,
 			expectedCode:    CodeTemporary,
 			expectedError:   false,
@@ -79,7 +79,7 @@ func TestHandleFailedVisit(t *testing.T) {
 		},
 		{
 			name:            "500 internal server error - max retries exceeded",
-			response:        createResponse(500),
+			response:        createTestResponse(500),
 			retries:         MaxJobRetries,
 			expectedCode:    CodePermanent,
 			expectedError:   true,
@@ -88,7 +88,7 @@ func TestHandleFailedVisit(t *testing.T) {
 		},
 		{
 			name:            "503 service unavailable with retry-after",
-			response:        createResponse(503, "Retry-After", "60"),
+			response:        createTestResponse(503, "Retry-After", "60"),
 			expectedCode:    CodeTemporary,
 			expectedError:   false,
 			expectPause:     true,
@@ -105,7 +105,7 @@ func TestHandleFailedVisit(t *testing.T) {
 		},
 		{
 			name:            "unknown status code",
-			response:        createResponse(418), // I'm a teapot
+			response:        createTestResponse(418), // I'm a teapot
 			expectedCode:    CodeUnknown,
 			expectedError:   false,
 			expectPause:     false,
@@ -149,7 +149,6 @@ func TestHandleFailedVisit(t *testing.T) {
 			}
 
 			code, err := handleFailedVisit(
-				context.Background(),
 				pauseFn,
 				republishFn,
 				job,