Skip to content

Commit 4b9b137

Browse files
committed
new: Fix tests on Arch Linux
The process of fixing these failures also exposed a silent failure in `@go.test_compgen` that will be addressed in the next commit.
1 parent b2dac0d commit 4b9b137

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

tests/new.bats

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ assert_command_script_is_executable() {
9090
touch "${internal_modules[@]}"
9191

9292
local expected
93-
@go.test_compgen 'expected' "$TEST_GO_SCRIPTS_DIR/lib"
93+
@go.test_compgen 'expected' -f "$TEST_GO_SCRIPTS_DIR/lib"
9494

9595
run "$TEST_GO_SCRIPT" complete 2 new '--internal'
96-
assert_success "${expected[@]}"
96+
assert_success "${expected[@]#$TEST_GO_SCRIPTS_DIR/lib/}"
9797

9898
run "$TEST_GO_SCRIPT" complete 2 new '--internal' 'f'
9999
assert_success 'foo '
@@ -111,8 +111,11 @@ assert_command_script_is_executable() {
111111
mkdir -p "$TEST_GO_ROOTDIR/lib/"
112112
touch "${public_modules[@]}"
113113

114+
local expected
115+
@go.test_compgen 'expected' -f "$TEST_GO_ROOTDIR/lib"
116+
114117
run "$TEST_GO_SCRIPT" complete 2 new '--public'
115-
assert_success "${public_modules[@]#$TEST_GO_ROOTDIR/lib/}"
118+
assert_success "${expected[@]#$TEST_GO_ROOTDIR/lib/}"
116119

117120
run "$TEST_GO_SCRIPT" complete 2 new '--public' 'q'
118121
assert_success 'quux '
@@ -130,8 +133,11 @@ assert_command_script_is_executable() {
130133
mkdir -p "$TEST_GO_ROOTDIR/tests/"
131134
touch "${test_files[@]}"
132135

136+
local expected
137+
@go.test_compgen 'expected' -f "$TEST_GO_ROOTDIR/$_GO_TEST_DIR"
138+
133139
run "$TEST_GO_SCRIPT" complete 2 new '--test'
134-
assert_success "${test_files[@]#$TEST_GO_ROOTDIR/tests/}"
140+
assert_success "${expected[@]#$TEST_GO_ROOTDIR/$_GO_TEST_DIR/}"
135141

136142
run "$TEST_GO_SCRIPT" complete 2 new '--test' 'f'
137143
assert_success 'frotz.bats '
@@ -150,19 +156,20 @@ assert_command_script_is_executable() {
150156
touch "${text_files[@]}"
151157

152158
local expected
153-
@go.test_compgen 'expected' "$TEST_GO_ROOTDIR/gue"
159+
@go.test_compgen 'expected' -f "$TEST_GO_ROOTDIR/g"
154160

155161
run "$TEST_GO_SCRIPT" complete 2 new '--type'
156162
assert_failure ''
157163

158164
run "$TEST_GO_SCRIPT" complete 3 new '--type' 'adversary' 'g'
159-
assert_success "${expected[@]}"
165+
assert_success "${expected[@]#$TEST_GO_ROOTDIR/}"
160166

161167
run "$TEST_GO_SCRIPT" complete 3 new '--type' 'adversary' 'gu'
162168
assert_success 'gue/'
163169

170+
@go.test_compgen 'expected' -f "$TEST_GO_ROOTDIR/gue/"
164171
run "$TEST_GO_SCRIPT" complete 3 new '--type' 'adversary' 'gue/'
165-
assert_success "${text_files[@]#$TEST_GO_ROOTDIR/}"
172+
assert_success "${expected[@]#$TEST_GO_ROOTDIR/}"
166173

167174
run "$TEST_GO_SCRIPT" complete 3 new '--type' 'adversary' 'gue/t'
168175
assert_success 'gue/thief.txt '

0 commit comments

Comments
 (0)