diff --git a/client/allocdir/alloc_dir_test.go b/client/allocdir/alloc_dir_test.go index 451ae32e6..82b3ae1cb 100644 --- a/client/allocdir/alloc_dir_test.go +++ b/client/allocdir/alloc_dir_test.go @@ -489,14 +489,15 @@ func TestAllocDir_DetectContentType(t *testing.T) { "input/happy.gif": "image/gif", "input/image.png": "image/png", "input/nomad.jpg": "image/jpeg", - "input/test.go": "application/octet-stream", + "input/test.bin": "application/octet-stream", "input/test.json": "application/json", "input/test.txt": "text/plain; charset=utf-8", + "input/test.go": "text/plain; charset=utf-8", } for _, file := range testFiles { fileInfo, err := os.Stat(file) require.Nil(err) res := detectContentType(fileInfo, file) - require.Equal(expectedEncodings[file], res) + require.Equal(expectedEncodings[file], res, "unexpected output for %v", file) } } diff --git a/client/allocdir/input/test.bin b/client/allocdir/input/test.bin new file mode 100644 index 000000000..abc8240e4 --- /dev/null +++ b/client/allocdir/input/test.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef +size 1024 diff --git a/client/allocdir/input/test.go b/client/allocdir/input/test.go index 8fd43ed1e..fe29791c4 100644 --- a/client/allocdir/input/test.go +++ b/client/allocdir/input/test.go @@ -1,9 +1,26 @@ -package main +package allocdir import ( - "fmt" + "os" + "syscall" ) -func main() { - fmt.Println("Hello, playground") +// linkDir hardlinks src to dst. The src and dst must be on the same filesystem. +func linkDir(src, dst string) error { + return syscall.Link(src, dst) +} + +// unlinkDir removes a directory link. +func unlinkDir(dir string) error { + return syscall.Unlink(dir) +} + +// createSecretDir creates the secrets dir folder at the given path +func createSecretDir(dir string) error { + return os.MkdirAll(dir, 0777) +} + +// removeSecretDir removes the secrets dir folder +func removeSecretDir(dir string) error { + return os.RemoveAll(dir) }