Merge branch 'fix-osx-specs' into 'master'

Fix `TestVFSRoot` and `TestReadlinkAbsolutePath`

See merge request gitlab-org/gitlab-pages!344

2 files changed, 19 insertions, 8 deletions

diff --git a/internal/vfs/local/root_test.go b/internal/vfs/local/root_test.go
index a4711169..c8ee6616 100644
--- a/internal/vfs/local/root_test.go
+++ b/internal/vfs/local/root_test.go
@@ -120,12 +120,11 @@ func TestReadlinkAbsolutePath(t *testing.T) {
 	// create structure as:
 	// /tmp/dir: directory
 	// /tmp/dir/symlink: points to `/tmp/file`
-	tmpDir, err := ioutil.TempDir("", "vfs")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpDir)
+	tmpDir, cleanup := tmpDir(t)
+	defer cleanup()
 
 	dirPath := filepath.Join(tmpDir, "dir")
-	err = os.Mkdir(dirPath, 0755)
+	err := os.Mkdir(dirPath, 0755)
 	require.NoError(t, err)
 
 	symlinkPath := filepath.Join(dirPath, "symlink")
diff --git a/internal/vfs/local/vfs_test.go b/internal/vfs/local/vfs_test.go
index 6ceb08a5..ec67d595 100644
--- a/internal/vfs/local/vfs_test.go
+++ b/internal/vfs/local/vfs_test.go
@@ -13,6 +13,19 @@ import (
 
 var localVFS = &VFS{}
 
+func tmpDir(t *testing.T) (string, func()) {
+	tmpDir, err := ioutil.TempDir("", "vfs")
+	require.NoError(t, err)
+
+	// On some systems `/tmp` can be a symlink
+	tmpDir, err = filepath.EvalSymlinks(tmpDir)
+	require.NoError(t, err)
+
+	return tmpDir, func() {
+		os.RemoveAll(tmpDir)
+	}
+}
+
 func TestVFSRoot(t *testing.T) {
 	// create structure as:
 	// /tmp/dir: directory
@@ -21,12 +34,11 @@ func TestVFSRoot(t *testing.T) {
 	// /tmp/file: file
 	// /tmp/file_link: symlink to `file`
 	// /tmp/file_absolute_link: symlink to `/tmp/file`
-	tmpDir, err := ioutil.TempDir("", "vfs")
-	require.NoError(t, err)
-	defer os.RemoveAll(tmpDir)
+	tmpDir, cleanup := tmpDir(t)
+	defer cleanup()
 
 	dirPath := filepath.Join(tmpDir, "dir")
-	err = os.Mkdir(dirPath, 0755)
+	err := os.Mkdir(dirPath, 0755)
 	require.NoError(t, err)
 
 	filePath := filepath.Join(tmpDir, "file")