Merge branch 'master' into exampleIterators

errors.go

@@ -21,11 +21,10 @@ func handleNoOp(err error) error {
 	if err == nil {
 		return nil
 	}
-
-	if _, ok := err.(NoOpError); !ok {
-		return err
+	if _, ok := err.(NoOpError); ok {
+		return nil
 	}
-	return nil
+	return err
 }
 
 type errorIndices []int

errors_test.go

@@ -0,0 +1,15 @@
+package tensor
+
+import (
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestHandleNoOp(t *testing.T) {
+	otherErr := errors.New("other error")
+
+	assert.Equal(t, nil, handleNoOp(noopError{}))
+	assert.Equal(t, nil, handleNoOp(nil))
+	assert.Equal(t, otherErr, handleNoOp(otherErr))
+}

internal/execution/keepsync.go

@@ -19,18 +19,12 @@ type NoOpError interface {
 	NoOp() bool
 }
 
-type noopError struct{}
-
-func (e noopError) NoOp() bool    { return true }
-func (e noopError) Error() string { return "NoOp" }
-
 func handleNoOp(err error) error {
 	if err == nil {
 		return nil
 	}
-
-	if _, ok := err.(NoOpError); !ok {
-		return err
+	if _, ok := err.(NoOpError); ok {
+		return nil
 	}
-	return nil
+	return err
 }

internal/execution/keepsync_test.go

@@ -0,0 +1,20 @@
+package execution
+
+import (
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+type noopError struct{}
+
+func (e noopError) NoOp() bool    { return true }
+func (e noopError) Error() string { return "NoOp" }
+
+func TestHandleNoOp(t *testing.T) {
+	otherErr := errors.New("other error")
+
+	assert.Equal(t, nil, handleNoOp(noopError{}))
+	assert.Equal(t, nil, handleNoOp(nil))
+	assert.Equal(t, otherErr, handleNoOp(otherErr))
+}

internal/storage/keepsync.go

@@ -19,18 +19,12 @@ type NoOpError interface {
 	NoOp() bool
 }
 
-type noopError struct{}
-
-func (e noopError) NoOp() bool    { return true }
-func (e noopError) Error() string { return "NoOp" }
-
 func handleNoOp(err error) error {
 	if err == nil {
 		return nil
 	}
-
-	if _, ok := err.(NoOpError); !ok {
-		return err
+	if _, ok := err.(NoOpError); ok {
+		return nil
 	}
-	return nil
+	return err
 }

internal/storage/keepsync_test.go

@@ -0,0 +1,20 @@
+package storage
+
+import (
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+type noopError struct{}
+
+func (e noopError) NoOp() bool    { return true }
+func (e noopError) Error() string { return "NoOp" }
+
+func TestHandleNoOp(t *testing.T) {
+	otherErr := errors.New("other error")
+
+	assert.Equal(t, nil, handleNoOp(noopError{}))
+	assert.Equal(t, nil, handleNoOp(nil))
+	assert.Equal(t, otherErr, handleNoOp(otherErr))
+}