Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2020-09-08 12:47:21 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2020-09-08 14:47:24 +0300
commit80dc1ac5d70c77a89a535e331dabb614c873f100 (patch)
treeb07bad174a0c8a708fa389b574ac94d860f5bbc1 /internal/vfs/local/vfs_test.go
parentabe307c8351886f80bce45e6eb7b6b1a5ba0411f (diff)
Fix `TestVFSRoot` and `TestReadlinkAbsolutePath`fix-osx-specs
Diffstat (limited to 'internal/vfs/local/vfs_test.go')
-rw-r--r--internal/vfs/local/vfs_test.go20
1 files changed, 16 insertions, 4 deletions
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")