Make it work with alpine container
diff --git a/src/temp.bash b/src/temp.bash index f7a9af0..d4d06ea 100755 --- a/src/temp.bash +++ b/src/temp.bash
@@ -98,7 +98,7 @@ local template="$prefix" template+="${BATS_TEST_FILENAME##*/}" template+="-${BATS_TEST_NUMBER}" - template+='-XXXXXXXXXX' + template+='-XXXXXX' local path if ! path="$(mktemp -d -- "${BATS_TMPDIR}/${template}" 2>&1)"; then
diff --git a/test/58-assert-10-assert_equal_files.bats b/test/58-assert-10-assert_equal_files.bats index 42b57cb..b391122 100644 --- a/test/58-assert-10-assert_equal_files.bats +++ b/test/58-assert-10-assert_equal_files.bats
@@ -40,7 +40,8 @@ run assert_files_equal "$file1" "$file2" [ "$status" -eq 1 ] [ "${#lines[@]}" -eq 5 ] - [ "${lines[0]}" == "cmp: ${TEST_FIXTURE_ROOT}/dir: Is a directory" ] + REGEX="cmp: ${TEST_FIXTURE_ROOT}/dir: (Is a directory|I/O error)" + [[ "${lines[0]}" =~ $REGEX ]] || false [ "${lines[1]}" == "-- files are not the same --" ] [ "${lines[2]}" == "path : $file1" ] [ "${lines[3]}" == "path : $file2" ]
diff --git a/test/58-assert-11-assert_not_equal_files.bats b/test/58-assert-11-assert_not_equal_files.bats index cb758d9..f7e719f 100644 --- a/test/58-assert-11-assert_not_equal_files.bats +++ b/test/58-assert-11-assert_not_equal_files.bats
@@ -39,7 +39,8 @@ run assert_files_not_equal "$file1" "$file2" [ "$status" -eq 0 ] [ "${#lines[@]}" -eq 1 ] - [ "${lines[0]}" == "cmp: ${TEST_FIXTURE_ROOT}/dir: Is a directory" ] + REGEX="cmp: ${TEST_FIXTURE_ROOT}/dir: (Is a directory|I/O error)" + [[ "${lines[0]}" =~ $REGEX ]] || false } @test 'assert_files_not_equal() <file>: replace prefix of displayed path' {
diff --git a/test/70-temp-10-temp_make.bats b/test/70-temp-10-temp_make.bats index 06d24de..55ca8e9 100755 --- a/test/70-temp-10-temp_make.bats +++ b/test/70-temp-10-temp_make.bats
@@ -9,9 +9,10 @@ teardown() { rm -r -- "$TEST_TEMP_DIR"; } TEST_TEMP_DIR="$(temp_make)" + echo $TEST_TEMP_DIR local -r literal="${BATS_TMPDIR}/${BATS_TEST_FILENAME##*/}-" - local -r pattern='[1-9][0-9]*-.{10}' + local -r pattern='[1-9][0-9]*-.{6}' [[ $TEST_TEMP_DIR =~ ^"${literal}"${pattern}$ ]] || false [ -e "$TEST_TEMP_DIR" ] } @@ -23,7 +24,8 @@ [ "$status" -eq 1 ] [ "${#lines[@]}" -eq 3 ] [ "${lines[0]}" == '-- ERROR: temp_make --' ] - [[ ${lines[1]} == 'mktemp: failed to create directory via template'* ]] + REGEX="mktemp: (failed to create directory via template|\(null\): No such file or directory)" + [[ ${lines[1]} =~ $REGEX ]] || false [ "${lines[2]}" == '--' ] } @@ -62,7 +64,7 @@ TEST_TEMP_DIR="$(temp_make "$@" 'test-')" local -r literal="${BATS_TMPDIR}/test-${BATS_TEST_FILENAME##*/}-" - local -r pattern='[1-9][0-9]*-.{10}' + local -r pattern='[1-9][0-9]*-.{6}' [[ $TEST_TEMP_DIR =~ ^"${literal}"${pattern}$ ]] || false [ -e "$TEST_TEMP_DIR" ] }