Print -> Info

log -> logger
remove added cleanup.go file
2026-02-07 20:40:44 +00:00 · 2021-09-16 12:33:33 -04:00 · 2021-09-16 12:26:11 -04:00 · 2021-09-16 12:24:16 -04:00 · 2021-09-16 12:17:35 -04:00 · 2021-09-16 12:15:04 -04:00
1 changed files with 13 additions and 9 deletions
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -52,6 +52,13 @@ func NewCLI() *CLI {
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			defer func() {
+				if cli.preserve {
+					logger.Info("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
 			}
@@ -103,11 +110,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
 		},
 	}
@@ -269,6 +271,12 @@ Does not run any perbutations.
 			if err := Cleanup(cli.testnet); err != nil {
 				return err
 			}
+			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
 			}
@@ -302,10 +310,6 @@ Does not run any perbutations.
 				return err
 			}

-			if err := Cleanup(cli.testnet); err != nil {
-				return err
-			}
-
 			return nil
 		},
 	})
Author	SHA1	Message	Date
William Banfield	056de14cc6	Print -> Info	2021-09-16 12:33:33 -04:00
William Banfield	771fb1ed5c	log -> logger	2021-09-16 12:26:11 -04:00
William Banfield	13f9731fd1	remove added cleanup.go file	2021-09-16 12:24:16 -04:00
William Banfield	d9d6807810	more preserve log	2021-09-16 12:17:35 -04:00
William Banfield	f5715f5932	log cleanup error	2021-09-16 12:15:04 -04:00
William Banfield	0b771f1c40	e2e: cleanup in benchmark as well	2021-09-15 18:13:46 -04:00
William Banfield	547baf9e64	cleanup on all errors if preserve not specified	2021-09-15 18:04:51 -04:00