From d9d68078103e9bd8fe17022a07eed6cadf499ba3 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Thu, 16 Sep 2021 12:17:35 -0400
Subject: [PATCH] more preserve log

---
 test/e2e/runner/main.go | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 73be1111c..b2d380145 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -52,9 +52,13 @@ func NewCLI() *CLI {
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
-			if !cli.preserve {
-				defer Cleanup(cli.testnet)
-			}
+			defer func() {
+				if cli.preserve {
+					log.Print("Preserving testnet contents because -preserve=true")
+				} else if err := Cleanup(cli.testnet); err != nil {
+					logger.Error("Error cleaning up testnet contents", "err", err)
+				}
+			}()
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -267,7 +271,11 @@ Does not run any perbutations.
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
-			defer Cleanup(cli.testnet)
+			defer func() {
+				if err := Cleanup(cli.testnet); err != nil {
+					logger.Error("Error cleaning up testnet contents", "err", err)
+				}
+			}()
 
 			if err := Setup(cli.testnet); err != nil {
 				return err