File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -2129,15 +2129,19 @@ ARGS according to `debugger'."
2129
2129
; ; When the error occurs in the calling of one of the
2130
2130
; ; wrapped expressions of an expect.
2131
2131
(buttercup--wrapper-fun-p (cadr frame))
2132
- ; ; TODO: When an error happens in code called outside an expect
2132
+ ; ; When an error happens in code called outside an expect
2133
2133
; ; buttercup--update-with-funcall
2134
2134
; ; apply buttercup--funcall
2135
2135
; ; buttercup--funcall - sets debugger
2136
2136
; ; apply FUNCTION
2137
2137
; ; FUNCTION -- spec body function
2138
2138
; ; condition-case -- from buttercup-with-converted-ert-signals
2139
- ; ; progn -- the same
2139
+ ; ; (let ((buttercup--stackframe-marker 1)) -- the same
2140
2140
; ; ACTUAL CODE
2141
+ (and (null (car frame))
2142
+ (eq 'let (cadr frame))
2143
+ (equal '((buttercup--stackframe-marker 1 )) (caddr frame))
2144
+ )
2141
2145
; ; TODO: What about an error in a matcher?
2142
2146
; ; TODO: What about :to-throw?
2143
2147
; ; TODO: What about signals in before and after blocks?
@@ -2192,7 +2196,9 @@ Specifically, `ert-test-failed' is converted to
2192
2196
`buttercup-pending' ."
2193
2197
(declare (indent 0 ))
2194
2198
`(condition-case err
2195
- (progn ,@body )
2199
+ (let ((buttercup--stackframe-marker 1 ))
2200
+ (ignore buttercup--stackframe-marker)
2201
+ ,@body )
2196
2202
(ert-test-failed
2197
2203
(buttercup-fail " %S" err))
2198
2204
(ert-test-skipped
You can’t perform that action at this time.
0 commit comments