From f6cb1ea85a7a75193644b8ba4516cb586c5dc52f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 2 Jan 2015 22:38:52 -0700 Subject: [PATCH] Simplify builder TestTestData slightly by using ioutil.ReadFile instead of os.Open+ioutil.ReadAll Signed-off-by: Andrew "Tianon" Page --- builder/parser/parser_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builder/parser/parser_test.go b/builder/parser/parser_test.go index 1b517fcc14..daceb9839c 100644 --- a/builder/parser/parser_test.go +++ b/builder/parser/parser_test.go @@ -54,18 +54,14 @@ func TestTestData(t *testing.T) { if err != nil { t.Fatalf("Dockerfile missing for %s: %s", dir.Name(), err.Error()) } - - rf, err := os.Open(resultfile) - if err != nil { - t.Fatalf("Result file missing for %s: %s", dir.Name(), err.Error()) - } + defer df.Close() ast, err := Parse(df) if err != nil { t.Fatalf("Error parsing %s's dockerfile: %s", dir.Name(), err.Error()) } - content, err := ioutil.ReadAll(rf) + content, err := ioutil.ReadFile(resultfile) if err != nil { t.Fatalf("Error reading %s's result file: %s", dir.Name(), err.Error()) } @@ -75,8 +71,5 @@ func TestTestData(t *testing.T) { fmt.Fprintln(os.Stderr, "Expected:\n"+string(content)) t.Fatalf("%s: AST dump of dockerfile does not match result", dir.Name()) } - - df.Close() - rf.Close() } }