From 54e24732d21e89a54ef8ddd5fa196602d45e1be9 Mon Sep 17 00:00:00 2001 From: Katy Moe Date: Fri, 3 Apr 2020 20:58:45 +0100 Subject: [PATCH 1/2] fix cleanup of acceptance test tmpdirs --- helper/resource/testing.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/helper/resource/testing.go b/helper/resource/testing.go index 7b331d80d13..ecea64c6154 100644 --- a/helper/resource/testing.go +++ b/helper/resource/testing.go @@ -108,10 +108,15 @@ func TestMain(m *testing.M) { os.Exit(1) } } else { + exitCode := m.Run() + if acctest.TestHelper != nil { - defer acctest.TestHelper.Close() + err := acctest.TestHelper.Close() + if err != nil { + log.Printf("Error cleaning up temporary test files: %s", err) + } } - os.Exit(m.Run()) + os.Exit(exitCode) } } From dbe9175e4afed4682a42444c43638704a178a1bf Mon Sep 17 00:00:00 2001 From: Katy Moe Date: Fri, 3 Apr 2020 21:27:37 +0100 Subject: [PATCH 2/2] add #378 to CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3f932f3c9f..2a20af831fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.9.1 (Unreleased) + +BUG FIXES: + +* Binary acceptance test driver: fix cleanup of temporary directories [GH-378] + # 1.9.0 (March 26, 2020) DEPRECATED: