Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 26 insertions, 0 deletions

diff --git a/workhorse/internal/lsif_transformer/parser/errors_test.go b/workhorse/internal/lsif_transformer/parser/errors_test.go
new file mode 100644
index 00000000000..31a7130d05e
--- /dev/null
+++ b/workhorse/internal/lsif_transformer/parser/errors_test.go
@@ -0,0 +1,26 @@
+package parser
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+type customErr struct {
+	err string
+}
+
+func (e customErr) Error() string {
+	return e.err
+}
+
+func TestCombineErrors(t *testing.T) {
+	err := combineErrors(nil, errors.New("first"), nil, customErr{"second"})
+	require.EqualError(t, err, "first\nsecond")
+
+	err = customErr{"custom error"}
+	require.Equal(t, err, combineErrors(nil, err, nil))
+
+	require.Nil(t, combineErrors(nil, nil, nil))
+}