diff options
| author | Ola Nilsson <ola.nilsson@gmail.com> | 2020-02-20 22:48:22 +0100 |
|---|---|---|
| committer | Ola Nilsson <ola.nilsson@gmail.com> | 2020-02-20 22:49:17 +0100 |
| commit | dcc26383e23764ed47620f8d73ebc750162ff02d (patch) | |
| tree | 399344b92d7118f39a30037cd7e84c6b5ee03e81 | |
| parent | e7e5d22572f37f55997122928fc62b073ab57c49 (diff) | |
Revert "Add an option to immediately abort Buttercup run if a test fails"
Merged prematurely.
This reverts commit e7e5d22572f37f55997122928fc62b073ab57c49.
| -rwxr-xr-x | bin/buttercup | 4 | ||||
| -rw-r--r-- | buttercup.el | 10 | ||||
| -rw-r--r-- | tests/test-buttercup.el | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/bin/buttercup b/bin/buttercup index 962cf07..606436b 100755 --- a/bin/buttercup +++ b/bin/buttercup @@ -31,8 +31,6 @@ Buttercup options: which case tests will be run if they match any of the given patterns. ---abort-on-failure, -a Abort test execution if any test fails. - --no-color, -c Do not colorize test output. --traceback STYLE When printing backtraces for errors that occur @@ -72,7 +70,7 @@ do shift shift ;; - "-c"|"--no-color"|"-a"|"--abort-on-failure") + "-c"|"--no-color") BUTTERCUP_ARGS+=("$1") shift ;; diff --git a/buttercup.el b/buttercup.el index 69020ca..2e7afa8 100644 --- a/buttercup.el +++ b/buttercup.el @@ -671,9 +671,6 @@ See also `buttercup-define-matcher'." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Suite and spec data structures -(defvar buttercup-stop-on-first-failure nil - "Abort Buttercup testing if any spec fails.") - (cl-defstruct buttercup-suite-or-spec ;; The name of this specific suite description @@ -1364,9 +1361,6 @@ current directory." ((member (car args) '("-c" "--no-color")) (setq buttercup-color nil) (setq args (cdr args))) - ((member (car args) '("-a" "--abort-on-failure")) - (setq buttercup-stop-on-first-failure t) - (setq args (cdr args))) (t (push (car args) dirs) (setq args (cdr args))))) @@ -1529,9 +1523,7 @@ failed and pending specs." '(passed pending)) (setf (buttercup-suite-or-spec-status suite-or-spec) status (buttercup-suite-or-spec-failure-description suite-or-spec) description - (buttercup-suite-or-spec-failure-stack suite-or-spec) stack) - (when (and buttercup-stop-on-first-failure (eq status 'failed)) - (signal 'buttercup-abort "Aborting early because of the failure"))))) + (buttercup-suite-or-spec-failure-stack suite-or-spec) stack)))) ;;;;;;;;;;;;; ;;; Reporters diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el index db61f21..a73f2ee 100644 --- a/tests/test-buttercup.el +++ b/tests/test-buttercup.el @@ -332,7 +332,6 @@ (buttercup--cleanup-functions :invalid) buttercup--current-suite (buttercup-reporter #'ignore) - buttercup-stop-on-first-failure buttercup-suites (buttercup-warning-buffer-name " *ignored buttercup warnings*")) ,@body)) |