From d302fdbf898e8b735660e280d22f96085e8d9dad Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 27 Apr 2015 17:06:54 +0200 Subject: [PATCH] functional tests: Fix rkt run context use Create just one context for the test and reset it after each iteration, so unused directories are removed immediately instead of during deferred cleanup. --- tests/rkt_caps_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/rkt_caps_test.go b/tests/rkt_caps_test.go index 23efa42..b923e0a 100644 --- a/tests/rkt_caps_test.go +++ b/tests/rkt_caps_test.go @@ -74,6 +74,9 @@ var capsTests = []struct { } func TestCaps(t *testing.T) { + ctx := newRktRunCtx() + defer ctx.cleanup() + for i, tt := range capsTests { var stage1FileName = "rkt-inspect-print-caps-stage1.aci" var stage2FileName = "rkt-inspect-print-caps-stage2.aci" @@ -87,8 +90,6 @@ func TestCaps(t *testing.T) { patchTestACI(stage2FileName, stage2Args...) defer os.Remove(stage1FileName) defer os.Remove(stage2FileName) - ctx := newRktRunCtx() - defer ctx.cleanup() for _, stage := range []int{1, 2} { t.Logf("Running test #%v: %v [stage %v]", i, tt.testName, stage) @@ -121,6 +122,7 @@ func TestCaps(t *testing.T) { t.Fatalf("rkt didn't terminate correctly: %v", err) } } + ctx.reset() } }