From d029fb179f659f24205b57f6517ffcb84323b78a Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sat, 15 Feb 2014 14:27:01 -0800 Subject: [PATCH 1/2] Fix engine tests on systems where temp directories are symlinked. Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) Upstream-commit: 353cc8c2a5d9ae4c02dc94e14cd2ad6d3393992d Component: engine --- components/engine/engine/engine_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/components/engine/engine/engine_test.go b/components/engine/engine/engine_test.go index 065a19f492..da59610727 100644 --- a/components/engine/engine/engine_test.go +++ b/components/engine/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 { From 0efb658af55bd59a2862577bf862d75b1c3ce1cc Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sat, 15 Feb 2014 14:37:51 -0800 Subject: [PATCH 2/2] Document Darwin test failure in a FIXME Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) Upstream-commit: 7286842a12e3620224e4de65730a3b40d17f1f3a Component: engine --- components/engine/tags_unit_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/engine/tags_unit_test.go b/components/engine/tags_unit_test.go index 1341b989fe..b6236280a8 100644 --- a/components/engine/tags_unit_test.go +++ b/components/engine/tags_unit_test.go @@ -31,6 +31,8 @@ func mkTestTagStore(root string, t *testing.T) *TagStore { t.Fatal(err) } img := &Image{ID: testImageID} + // FIXME: this fails on Darwin with: + // tags_unit_test.go:36: mkdir /var/folders/7g/b3ydb5gx4t94ndr_cljffbt80000gq/T/docker-test569b-tRunner-075013689/vfs/dir/foo/etc/postgres: permission denied if err := graph.Register(nil, archive, img); err != nil { t.Fatal(err) }