Not duplicate error code

Author: rosylilly

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@master
         with:
-          go-version: "1.15"
+          go-version: "1.16"
       - uses: actions/checkout@master
         with:
           fetch-depth: 1

Makefile

@@ -5,17 +5,7 @@ GOMAXPROCS?=$(shell nproc)
 .PHONY: test
 test:
 	@mkdir -p tmp
-	@echo "mode: atomic" > tmp/cover.out
-	@for d in $(shell go list ./... | grep -v vendor | grep -v demo); do \
-		GOMAXPROCS=$(GOMAXPROCS) \
-			go test \
-			$(GOARGS) \
-			-timeout $(GOTIMEOUT) \
-			-coverprofile=tmp/pkg.out -covermode=atomic \
-			"$$d" || exit 1; \
-		tail -n +2 tmp/pkg.out >> tmp/cover.out && \
-		rm tmp/pkg.out; \
-	done
+	@go test -cover -coverprofile=tmp/cover.out -covermode=atomic ./...
 	@go tool cover -html=tmp/cover.out -o tmp/coverage.html
 
 .PHONY: bench

benchmark_step.go

@@ -26,7 +26,11 @@ func (b *BenchmarkStep) AddError(err error) {
 	b.mu.RLock()
 	defer b.mu.RUnlock()
 
-	b.result.Errors.Add(failure.NewError(b.errorCode, err))
+	if b.errorCode != nil {
+		b.result.Errors.Add(failure.NewError(b.errorCode, err))
+	} else {
+		b.result.Errors.Add(err)
+	}
 }
 
 func (b *BenchmarkStep) AddScore(tag score.ScoreTag) {

failure/cleaner_test.go

@@ -24,12 +24,13 @@ func TestBacktraceCleaner(t *testing.T) {
 		return strings.HasSuffix(b.Function, "TestBacktraceCleaner")
 	})
 
+	var code StringCode = "cleaner"
 	var f func(int) error
 	f = func(n int) error {
 		if n > 0 {
 			return f(n - 1)
 		}
-		return NewError(UnknownErrorCode, fmt.Errorf("invalid"))
+		return NewError(code, fmt.Errorf("invalid"))
 	}
 
 	err := f(0)

failure/error.go

@@ -20,11 +20,11 @@ type Error struct {
 	frames []xerrors.Frame
 }
 
-func NewError(code Code, err error) *Error {
-	// var wrapped *Error
-	// if ok := As(err, &wrapped); ok {
-	// 	return NewError(code, wrapped.err)
-	// }
+func NewError(code Code, err error) error {
+	// Skip already wrapped
+	if IsCode(err, code) {
+		return err
+	}
 
 	var nerr net.Error
 	if As(err, &nerr) {

failure/error_test.go

@@ -12,6 +12,7 @@ import (
 const (
 	errApplication StringCode = "application"
 	errTemporary   StringCode = "temporary"
+	errTest        StringCode = "test"
 )
 
 func TestError(t *testing.T) {
@@ -111,6 +112,14 @@ func TestErrorWrap(t *testing.T) {
 	if !reflect.DeepEqual(codes, expectCodes) {
 		t.Fatalf("Error codes is invalid:\n  %v\n  %v", codes, expectCodes)
 	}
+
+	err := NewError(errTest, fmt.Errorf("error"))
+	nilError := NewError(errTest, err)
+	codes = GetErrorCodes(nilError)
+	expectCodes = []string{"test"}
+	if !reflect.DeepEqual(codes, expectCodes) {
+		t.Fatalf("Error codes is invalid:\n  %v\n  %v", codes, expectCodes)
+	}
 }
 
 func TestErrorFrames(t *testing.T) {

failure/errors_test.go

@@ -27,6 +27,12 @@ func TestErrors(t *testing.T) {
 	if len(errors) != 100 {
 		t.Errorf("missmatch errors count: %d", len(errors))
 	}
+
+	set.Reset()
+	moreErrors := set.All()
+	if len(moreErrors) != 0 {
+		t.Errorf("missmatch errors count: %d", len(moreErrors))
+	}
 }
 
 func TestErrorsClosed(t *testing.T) {

score/score_test.go

@@ -13,13 +13,19 @@ func TestScoreWithDone(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		score.Add("foo")
 		score.Add("bar")
+		score.Add("baz")
 	}
 
 	score.Done()
 
 	if score.Total() != 3000 {
 		t.Fatalf("Expected 3000 but got %d", score.Total())
 	}
+
+	score.Reset()
+	if score.Total() != 0 {
+		t.Fatalf("Expected 0 but got %d", score.Total())
+	}
 }
 
 func TestScoreWithContext(t *testing.T) {