Skip to content

Commit 16e659a

Browse files
committed
fix: alpine failing tests
1 parent f0158e7 commit 16e659a

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

src/clock.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ function clock::now() {
3232
has_shell_time="$?"
3333
if [[ "$has_shell_time" -eq 0 ]]; then
3434
local seconds microseconds
35-
seconds="${shell_time%%.*}"
36-
microseconds="${shell_time#*.}"
37-
microseconds="${microseconds:-0}"
35+
if [[ "$shell_time" == *.* ]]; then
36+
seconds="${shell_time%%.*}"
37+
microseconds="${shell_time#*.}"
38+
else
39+
seconds="$shell_time"
40+
microseconds=0
41+
fi
3842

3943
echo $((seconds * 1000000000 + microseconds * 1000))
4044
return 0

src/env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ function env::active_internet_connection() {
7979
function env::find_terminal_width() {
8080
local cols=""
8181

82-
if [[ -z "$cols" ]] && command -v stty > /dev/null; then
82+
if command -v tput > /dev/null; then
8383
cols=$(tput cols 2>/dev/null)
8484
fi
85-
if [[ -n "$TERM" ]] && command -v tput > /dev/null; then
85+
if [[ -z "$cols" ]] && command -v stty > /dev/null; then
8686
cols=$(stty size 2>/dev/null | cut -d' ' -f2)
8787
fi
8888

tests/unit/directory_test.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ function test_unsuccessful_assert_is_directory_readable_when_a_file_is_given() {
111111
}
112112

113113
function test_unsuccessful_assert_is_directory_readable_without_execution_permission() {
114-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
114+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
115+
skip "permission checks unreliable as root"
115116
return
116117
fi
117118

@@ -126,7 +127,8 @@ function test_unsuccessful_assert_is_directory_readable_without_execution_permis
126127
}
127128

128129
function test_unsuccessful_assert_is_directory_readable_without_read_permission() {
129-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
130+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
131+
skip "permission checks unreliable as root"
130132
return
131133
fi
132134

@@ -141,7 +143,8 @@ function test_unsuccessful_assert_is_directory_readable_without_read_permission(
141143
}
142144

143145
function test_successful_assert_is_directory_not_readable_without_read_permission() {
144-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
146+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
147+
skip "permission checks unreliable as root"
145148
return
146149
fi
147150

@@ -152,7 +155,8 @@ function test_successful_assert_is_directory_not_readable_without_read_permissio
152155
}
153156

154157
function test_successful_assert_is_directory_not_readable_without_execution_permission() {
155-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
158+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
159+
skip "permission checks unreliable as root"
156160
return
157161
fi
158162

@@ -178,7 +182,8 @@ function test_successful_assert_is_directory_writable() {
178182
}
179183

180184
function test_unsuccessful_assert_is_directory_writable() {
181-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
185+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
186+
skip "permission checks unreliable as root"
182187
return
183188
fi
184189

@@ -202,7 +207,8 @@ function test_unsuccessful_assert_is_directory_writable_when_a_file_is_given() {
202207
}
203208

204209
function test_successful_assert_is_directory_not_writable() {
205-
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" ]]; then
210+
if [[ "$_OS" == "Windows" || $_DISTRO = "Alpine" || $(id -u) -eq 0 ]]; then
211+
skip "permission checks unreliable as root"
206212
return
207213
fi
208214

0 commit comments

Comments
 (0)