Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

caddytest changes round 1 #6405

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

caddytest changes round 1 #6405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b732a79
testing: make it so caddytest launches an instance of caddy per server
elee1766 Jun 24, 2024
38fba59
fix rebase
elee1766 Jun 24, 2024
e8d2c50
resolve logging
elee1766 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion caddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"encoding/hex"
"encoding/json"
"errors"
"flag"
"fmt"
"io"
"io/fs"
Expand Down Expand Up @@ -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)
}
Comment on lines -781 to +785
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding is that the entire rebuild of the command is to avoid this call to os.Exit, evident by the comment inside MainForTesting. Couldn't you do this same check with the previous code as-is? I fail to see the need for the command refactor.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no.

the reason that we build a new command is to pass args to the main command.

each rootCmd can only be invoked sequentially, because the args passed to the command populate a struct within rootCmd. you can't run two different rootCmd's in parallel.

so rootCmd.SetArgs(args) is the line that requires creating a new command.

}()

if remoteAdminServer != nil {
Expand Down
Loading
Loading