Skip to content

Commit c39e74c

Browse files
committed
fix bis
1 parent 3ec4690 commit c39e74c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/Bash/handlePipelineFailure.bats

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source "${srcDir}/Bash/handlePipelineFailure.sh"
99

1010
function Bash::handlePipelineFailure::withHead { #@test
1111
local resultingStatus=0
12-
local -a originalPipeStatus=()
12+
local -a originalPipeStatus=("notset")
1313
yes | head -n 1 || Bash::handlePipelineFailure resultingStatus originalPipeStatus
1414
[[ "${resultingStatus}" = "0" ]]
1515
run echo "${originalPipeStatus[*]}"
@@ -24,7 +24,7 @@ function Bash::handlePipelineFailure::withHeadWithoutStatusArg { #@test
2424

2525
function Bash::handlePipelineFailure::unknownCommand { #@test
2626
local resultingStatus=0
27-
local -a originalPipeStatus=()
27+
local -a originalPipeStatus=("notset")
2828
unknownCommand | head -n 1 || Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
2929
[[ "${resultingStatus}" = "127" ]]
3030
run echo "${originalPipeStatus[*]}"
@@ -39,7 +39,7 @@ function Bash::handlePipelineFailure::unknownCommandWithoutStatusArg { #@test
3939

4040
function Bash::handlePipelineFailure::shouldFail { #@test
4141
local resultingStatus=0
42-
local -a originalPipeStatus=()
42+
local -a originalPipeStatus=("notset")
4343
local standardStatus=0
4444
echo "test" | grep -q "hello" ||
4545
Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
@@ -59,9 +59,10 @@ function Bash::handlePipelineFailure::shouldFailWithoutStatusArg { #@test
5959
function Bash::handlePipelineFailure::shouldWork { #@test
6060
local resultingStatus=1
6161
local standardStatus=0
62-
local -a originalPipeStatus=()
62+
local -a originalPipeStatus=("notset")
6363
"${FRAMEWORK_ROOT_DIR}/bin/findShebangFiles" --help |
64-
grep -q DESCRIPTION || Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
64+
grep -q DESCRIPTION || Bash::handlePipelineFailure resultingStatus originalPipeStatus ||
65+
standardStatus="$?"
6566
run echo "${originalPipeStatus[*]}"
6667
assert_output "141 0"
6768
run echo "${resultingStatus}"
@@ -79,18 +80,22 @@ function Bash::handlePipelineFailure::shouldWorkWithoutStatusArg { #@test
7980

8081
function Bash::handlePipelineFailure::shouldWorkWith2Pipes { #@test
8182
local resultingStatus=0
82-
local -a originalPipeStatus=()
83+
local standardStatus=0
84+
local -a originalPipeStatus=("notset")
8385
"${FRAMEWORK_ROOT_DIR}/bin/findShebangFiles" --help | grep -q DESCRIPTION | cat ||
84-
Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
86+
Bash::handlePipelineFailure resultingStatus originalPipeStatus ||
87+
standardStatus="$?"
8588
run echo "${resultingStatus}"
8689
assert_output "0"
8790
run echo "${originalPipeStatus[*]}"
8891
assert_output "141 0 0"
92+
run echo "${standardStatus}"
93+
assert_output "0"
8994
}
9095

9196
function Bash::handlePipelineFailure::shouldWorkWith2PipesBis { #@test
9297
local resultingStatus=0
93-
local -a originalPipeStatus=()
98+
local -a originalPipeStatus=("notset")
9499
echo "world" | "${FRAMEWORK_ROOT_DIR}/bin/findShebangFiles" --help |
95100
grep -q DESCRIPTION ||
96101
Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
@@ -102,7 +107,7 @@ function Bash::handlePipelineFailure::shouldWorkWith2PipesBis { #@test
102107

103108
function Bash::handlePipelineFailure::shouldFailWith2Pipes { #@test
104109
local resultingStatus=0
105-
local -a originalPipeStatus=()
110+
local -a originalPipeStatus=("notset")
106111
echo "test" | grep t | grep -q "hello" ||
107112
Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
108113
run echo "${resultingStatus}"
@@ -113,7 +118,7 @@ function Bash::handlePipelineFailure::shouldFailWith2Pipes { #@test
113118

114119
function Bash::handlePipelineFailure::shouldFailWith2PipesBis { #@test
115120
local resultingStatus=0
116-
local -a originalPipeStatus=()
121+
local -a originalPipeStatus=("notset")
117122
echo "test" | grep -q "hello" | grep t ||
118123
Bash::handlePipelineFailure resultingStatus originalPipeStatus || true
119124
run echo "${resultingStatus}"

0 commit comments

Comments
 (0)