diff --git a/caddytest/caddytest.go b/caddytest/caddytest.go index 5585a9343..3de5b96b0 100644 --- a/caddytest/caddytest.go +++ b/caddytest/caddytest.go @@ -201,7 +201,7 @@ func (tc *Tester) startServer() error { // start inprocess caddy server go func() { - caddycmd.MainForTesting("caddy", "run", "--config", tc.configFileName, "--adapter", "caddyfile") + caddycmd.MainForTesting("run", "--config", tc.configFileName, "--adapter", "caddyfile") }() // wait for caddy admin api to start. it should happen quickly. for retries := 10; retries > 0 && isCaddyAdminRunning() != nil; retries-- { diff --git a/cmd/main.go b/cmd/main.go index 3e0359334..4526b26b6 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -94,7 +94,7 @@ func MainForTesting(args ...string) error { Version: rootCmd.Version, } tmpRootCmp.SetArgs(args) - if err := rootCmd.Execute(); err != nil { + if err := tmpRootCmp.Execute(); err != nil { return err } return nil