testing: make it so caddytest launches an instance of caddy per server

caddyserver · Jun 24, 2024 · b732a79 · b732a79
1 parent c2ccf86
commit b732a79
Show file tree

Hide file tree

Showing 24 changed files with 1,068 additions and 878 deletions.
diff --git a/caddy.go b/caddy.go
@@ -20,6 +20,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"flag"
 	"fmt"
 	"io"
 	"io/fs"
@@ -778,7 +779,10 @@ func exitProcess(ctx context.Context, logger *zap.Logger) {
 			} else {
 				logger.Error("unclean shutdown")
 			}
-			os.Exit(exitCode)
+			// check if we are in test environment, and dont call exit if we are
+			if flag.Lookup("test.v") == nil && !strings.Contains(os.Args[0], ".test") {
+				os.Exit(exitCode)
+			}
 		}()
 
 		if remoteAdminServer != nil {