From 547baf9e641c2ba41bff05c96cdf85b285c4e1ad Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Wed, 15 Sep 2021 18:04:51 -0400
Subject: [PATCH] cleanup on all errors if preserve not specified

---
 test/e2e/runner/main.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index f65b6d0b1..82ed69ae5 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -52,6 +52,9 @@ func NewCLI() *CLI {
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			if !cli.preserve {
+				defer Cleanup(cli.testnet)
+			}
 			if err := Setup(cli.testnet); err != nil {
 				return err
 			}
@@ -103,11 +106,6 @@ func NewCLI() *CLI {
 			if err := Test(cli.testnet); err != nil {
 				return err
 			}
-			if !cli.preserve {
-				if err := Cleanup(cli.testnet); err != nil {
-					return err
-				}
-			}
 			return nil
 		},
 	}