Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
| ... | ... |
@@ -54,18 +54,14 @@ func TestTestData(t *testing.T) {
|
| 54 | 54 |
if err != nil {
|
| 55 | 55 |
t.Fatalf("Dockerfile missing for %s: %s", dir.Name(), err.Error())
|
| 56 | 56 |
} |
| 57 |
- |
|
| 58 |
- rf, err := os.Open(resultfile) |
|
| 59 |
- if err != nil {
|
|
| 60 |
- t.Fatalf("Result file missing for %s: %s", dir.Name(), err.Error())
|
|
| 61 |
- } |
|
| 57 |
+ defer df.Close() |
|
| 62 | 58 |
|
| 63 | 59 |
ast, err := Parse(df) |
| 64 | 60 |
if err != nil {
|
| 65 | 61 |
t.Fatalf("Error parsing %s's dockerfile: %s", dir.Name(), err.Error())
|
| 66 | 62 |
} |
| 67 | 63 |
|
| 68 |
- content, err := ioutil.ReadAll(rf) |
|
| 64 |
+ content, err := ioutil.ReadFile(resultfile) |
|
| 69 | 65 |
if err != nil {
|
| 70 | 66 |
t.Fatalf("Error reading %s's result file: %s", dir.Name(), err.Error())
|
| 71 | 67 |
} |
| ... | ... |
@@ -75,8 +71,5 @@ func TestTestData(t *testing.T) {
|
| 75 | 75 |
fmt.Fprintln(os.Stderr, "Expected:\n"+string(content)) |
| 76 | 76 |
t.Fatalf("%s: AST dump of dockerfile does not match result", dir.Name())
|
| 77 | 77 |
} |
| 78 |
- |
|
| 79 |
- df.Close() |
|
| 80 |
- rf.Close() |
|
| 81 | 78 |
} |
| 82 | 79 |
} |