Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
- Internal: Split `src/runner.sh` and `src/coverage.sh` into focused modules with no behavior change; see [ADR-010](adrs/adr-010-src-module-directories.md) (#924, #925)

### Fixed
- A failing test whose output quotes a shell-error phrase is no longer also reported as a runtime `Error`. The classifier scanned the whole capture -- which includes bashunit's own failure rendering -- for strings like `command not found`, so one cause was reported twice. It now requires the source-and-line prefix bash puts on a real diagnostic (#992)
- `assert_have_been_called_times` and `assert_have_been_called_nth_with` report a usage error when their numeric argument is not a number, instead of leaking `[: my_cmd: integer expression expected` from inside bashunit. The common cause is swapping the count and the spy, which the message now names (#984)
- `assert_false` no longer passes when the command does not exist. Exit code 127 is non-zero, so a typo in the command name satisfied the assertion while testing nothing; 127 and 126 now fail both `assert_true` and `assert_false`, because they mean the command never ran
- `assert_within_delta` accepts a leading `+` on any operand (#979)
Expand Down
10 changes: 6 additions & 4 deletions src/assert/core.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,10 +137,12 @@ _BASHUNIT_ASSERT_EXIT_DESC_OUT=""
# word rather than evaluated, and the failure used to point nowhere near the
# cause.
#
# The wording deliberately avoids the literal phrase "command not found".
# runner/diagnostics.sh classifies a test as a runtime error by scanning its
# output for that exact string, so using it here made every such failure report
# as both Failed and Error for the one cause.
# The wording avoided the literal phrase "command not found" because
# runner/diagnostics.sh used to classify a test as a runtime error by scanning
# its output for that exact string, which made every such failure report as both
# Failed and Error. That constraint is gone -- the classifier now requires a
# shell diagnostic's source-and-line prefix as well (#992). The phrasing stays
# as it is because it is already documented and released, not because it must.
# Arguments: $1 - exit code, $2 - the command as written
##
function bashunit::assert::_describe_exit_code() {
Expand Down
61 changes: 54 additions & 7 deletions src/runner/diagnostics.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,20 +75,67 @@ $usage_after"
return
fi

# Conditions the shell reports without a source-and-line prefix, because they
# come from job control rather than the parser. Matched anywhere in the
# capture, as before.
case "$runtime_output" in
*"killed"* | *"segmentation fault"* | *"cannot allocate memory"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac

# Everything else is a diagnostic bash emits with its source and line
# ("file.sh: line 12: foo: command not found"). The cheap gate first: most
# failing tests contain none of these phrases and pay one glob.
case "$runtime_output" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"cannot allocate memory"* | *"bad file descriptor"* | \
*"segmentation fault"* | *"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | *"killed"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
;;
*"not a valid identifier"* | *"unexpected EOF"*) ;;
*) return ;;
esac

# A phrase alone is not enough. The capture also carries bashunit's own
# rendering of the failure, and a test whose subject is error handling will
# legitimately quote one of these strings as data -- both used to be misread
# as runtime errors and reported twice, as Failed and as Error, for one cause.
# Requiring the prefix on the same line separates what the shell said from what
# we said about it; bashunit's own output never carries it.
local line
while IFS= read -r line; do
case "$line" in
*": line "[0-9]*": "*) ;;
*) continue ;;
esac

case "$line" in
*"command not found"* | *"unbound variable"* | *"permission denied"* | \
*"no such file or directory"* | *"syntax error"* | *"bad substitution"* | \
*"division by 0"* | *"bad file descriptor"* | \
*"illegal option"* | *"argument list too long"* | \
*"readonly variable"* | *"missing keyword"* | \
*"cannot execute binary file"* | *"invalid arithmetic operator"* | \
*"ambiguous redirect"* | *"integer expression expected"* | \
*"too many arguments"* | *"value too great"* | \
*"not a valid identifier"* | *"unexpected EOF"*)
# Extract from the whole capture, not the matched line: the message shape
# (leading source stripped, newlines removed) is pinned by
# tests/unit/runner/diagnostics_test.sh.
local runtime_error="${runtime_output#*: }"
_BASHUNIT_RUNNER_RUNTIME_ERROR_OUT="${runtime_error//$'\n'/}"
return
;;
esac
done <<EOF
$runtime_output
EOF
}

##
Expand Down
36 changes: 36 additions & 0 deletions tests/acceptance/bashunit_runtime_error_classification_test.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env bash
set -euo pipefail

# The classifier scans a failing test's captured output for shell-error phrases.
# That output also carries bashunit's own rendering, so a failure message -- or
# a test that legitimately quotes a diagnostic -- used to be misread as a
# runtime error and reported twice, as Failed and as Error, for one cause.
function test_quoting_a_diagnostic_is_not_a_runtime_error() {
local fixture=tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
local output exit_code=0

output=$(NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Failed: Quotes a shell diagnostic as data" "$output"
assert_not_contains "βœ— Error: Quotes a shell diagnostic as data" "$output"
}

# The regression guard: a test that really does hit a shell error must still be
# classified as one.
#
# Pinned to LC_ALL=C on purpose. bash translates its diagnostics, and the phrase
# list this classifier matches on is English only, so under a Spanish or
# Japanese locale a genuine "command not found" is not recognised at all. That
# is a pre-existing limitation, not something this test should assert about;
# forcing the C locale keeps it testing the classification mechanics.
function test_a_real_shell_error_is_still_reported() {
local fixture=tests/acceptance/fixtures/runtime_error/real_error.sh
local output exit_code=0

output=$(LC_ALL=C NO_COLOR=1 ./bashunit --no-parallel --skip-env-file "$fixture" 2>&1) || exit_code=$?

assert_same 1 "$exit_code"
assert_contains "βœ— Error: Hits a real shell error" "$output"
assert_contains "command not found" "$output"
}
10 changes: 10 additions & 0 deletions tests/acceptance/fixtures/runtime_error/quotes_a_diagnostic.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# A test whose subject is error handling: its output legitimately contains the
# text of a shell diagnostic, as data. The test fails on its assertion, but
# nothing went wrong at runtime -- it must not also be reported as an Error.
function test_quotes_a_shell_diagnostic_as_data() {
local captured="bash: some_tool: command not found"

assert_same "expected something else" "$captured"
}
6 changes: 6 additions & 0 deletions tests/acceptance/fixtures/runtime_error/real_error.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

function test_hits_a_real_shell_error() {
definitely_not_a_real_command_xyz
assert_same 1 1
}
Loading