From 353cc8c2a5d9ae4c02dc94e14cd2ad6d3393992d Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sat, 15 Feb 2014 14:27:01 -0800 Subject: [PATCH] Fix engine tests on systems where temp directories are symlinked. Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) --- engine/engine_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/engine/engine_test.go b/engine/engine_test.go index 065a19f49..da5961072 100644 --- a/engine/engine_test.go +++ b/engine/engine_test.go @@ -4,6 +4,7 @@ import ( "io/ioutil" "os" "path" + "path/filepath" "testing" ) @@ -64,6 +65,18 @@ func TestEngineRoot(t *testing.T) { t.Fatal(err) } defer os.RemoveAll(tmp) + // We expect Root to resolve to an absolute path. + // FIXME: this should not be necessary. + // Until the above FIXME is implemented, let's check for the + // current behavior. + tmp, err = filepath.EvalSymlinks(tmp) + if err != nil { + t.Fatal(err) + } + tmp, err = filepath.Abs(tmp) + if err != nil { + t.Fatal(err) + } dir := path.Join(tmp, "dir") eng, err := New(dir) if err != nil {