Merge pull request #3594 from akutz/bugfix/fault-in-panic

bug: Do not panic on fault.In for valid errs
vmware · Oct 15, 2024 · cd4331e · cd4331e
2 parents eeedeaf + 0083eae
commit cd4331e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/fault/fault.go b/fault/fault.go
@@ -255,6 +255,8 @@ func In(err any, onFaultFn OnFaultFn) {
 			}
 			In(uErr, onFaultFn)
 		}
+	case error:
+		// No-op
 	default:
 		panic("fault: err must implement error, types.BaseMethodFault, or " +
 			"types.HasLocalizedMethodFault")

diff --git a/fault/fault_test.go b/fault/fault_test.go
@@ -413,6 +413,12 @@ func TestIn(t *testing.T) {
 			expectedNumCalls: 0,
 			expectedPanic:    unsupported,
 		},
+		{
+			name:             "err is unsupported but still an err",
+			err:              errors.New("error"),
+			callback:         &testHarness{},
+			expectedNumCalls: 0,
+		},
 		{
 			name:             "error is task.Error",
 			err:              task.Error{},