Skip to content

Commit ac42da4

Browse files
committed
Revert "test: Fix test suite"
This reverts commit e4cdfc2.
1 parent f3800e3 commit ac42da4

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

pkg/lib/commands/do-add.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ do-add() {
8484
if [[ ! -d "$subDep" && -n "${BPM_MODE_TEST+x}" ]]; then
8585
# During some tests, plumbing-* or Git commands may be stubbed,
8686
# so the package may not actually be cloned
87-
continue
87+
return
8888
fi
8989

9090
local oldWd="$PWD"

tests/do-init.bats

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,15 @@ load './util/init.sh'
3535

3636
eval "$(do-init bash)"
3737

38-
assert command -v _bpm
38+
command -v _bpm
3939
}
4040

4141
@test "is fish compatible" {
4242
if ! command -v fish &>/dev/null; then
4343
skip "Command 'fish' not in PATH"
4444
fi
4545

46-
HOME= XDG_DATA_HOME= XDG_STATE_HOME= XDG_CONFIG_HOME= run fish -Pc '. (bpm init fish | psub)'
47-
48-
assert_success
46+
HOME= XDG_DATA_HOME= XDG_CONFIG_HOME= run fish -Pc '. (bpm init fish | psub)'
4947
}
5048

5149
@test "is sh-compatible" {

tests/util/init.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ export LANG="C"
1616
export LANGUAGE="C"
1717
export LC_ALL="C"
1818
export XDG_DATA_HOME=
19-
export PATH="$BPM_ROOT/pkg/bin:$PATH" # TODO
19+
export PATH="$BPM_ROOT/pkg/bin:$PATH"
2020

2121
export PROGRAM_LIB_DIR="$BATS_TEST_DIRNAME/../pkg/lib"
22-
export BPM_ROOT="$BATS_TEST_DIRNAME/../.."
22+
export BPM_ROOT="$BATS_TEST_DIRNAME/.."
2323
export BPM_PREFIX="$BPM_TEST_DIR/cellar"
2424
export BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
2525
export BPM_INSTALL_BIN="$BPM_PREFIX/bin"
2626
export BPM_INSTALL_MAN="$BPM_PREFIX/man"
2727
export BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
2828

29-
for f in "$BPM_ROOT"/source/pkg/lib/{commands,util}/?*.sh; do
29+
for f in "$BPM_ROOT"/pkg/lib/{commands,util}/?*.sh; do
3030
source "$f"
3131
done
3232

0 commit comments

Comments
 (0)