Merge pull request #208 from mbland/fix-fileutil-create-dirs-msys2

tests/fileutil/create-dirs: Skip test on MSYS2
mbland · Sep 4, 2017 · a06e295 · a06e295
2 parents cab4509 + f08342a
commit a06e295
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/fileutil/copy-files-safely.bats b/tests/fileutil/copy-files-safely.bats
@@ -112,9 +112,7 @@ teardown() {
 
   run ls -ld "$DEST_DIR/"{,foo}
   assert_success
-  assert_lines_match \
-    "^drwx-w--wx .* $DEST_DIR/*$" \
-    "^--w------- .* $DEST_DIR/foo\$"
+  assert_lines_match '^drwx-w--wx' '^--w-------'
 }
 
 @test "$SUITE: logs FATAL if copy fails" {

diff --git a/tests/fileutil/create-dirs.bats b/tests/fileutil/create-dirs.bats
@@ -81,6 +81,7 @@ assert_dirs_created() {
 }
 
 @test "$SUITE: permissions don't change if directory already exists" {
+  skip_if_cannot_trigger_file_permission_failure
   mkdir -p "$TEST_GO_ROOTDIR/foo"
   chmod 700 "$TEST_GO_ROOTDIR/foo"