mirror of
https://github.com/caddyserver/caddy.git
synced 2025-01-07 11:28:48 +03:00
wrote startupshutdown tests and added OncePerServerBlock value in the NewTestController function of the controller.go file
This commit is contained in:
parent
6a32076271
commit
19148eba44
2 changed files with 61 additions and 0 deletions
|
@ -58,6 +58,9 @@ func NewTestController(input string) *Controller {
|
||||||
Root: ".",
|
Root: ".",
|
||||||
},
|
},
|
||||||
Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)),
|
Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)),
|
||||||
|
OncePerServerBlock: func(f func() error) error {
|
||||||
|
return f()
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
58
config/setup/startupshutdown_test.go
Normal file
58
config/setup/startupshutdown_test.go
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
package setup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The Startup function's tests are symmetrical to Shutdown tests,
|
||||||
|
// because the Startup and Shutdown functions share virtually the
|
||||||
|
// same functionality
|
||||||
|
func TestStartup(t *testing.T) {
|
||||||
|
|
||||||
|
tempDirPath, err := getTempDirPath()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("BeforeTest: Failed to find an existing directory for testing! Error was: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
testDir := filepath.Join(tempDirPath, "temp_dir_for_testing_startupshutdown.go")
|
||||||
|
osSenitiveTestDir := filepath.FromSlash(testDir)
|
||||||
|
|
||||||
|
exec.Command("rm", "-r", osSenitiveTestDir).Start() // removes osSenitiveTestDir from the OS's temp directory, if the osSenitiveTestDir already exists
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
input string
|
||||||
|
shouldExecutionErr bool
|
||||||
|
shouldRemoveErr bool
|
||||||
|
}{
|
||||||
|
// test case #0 tests proper functionality blocking commands
|
||||||
|
{"startup mkdir " + osSenitiveTestDir, false, false},
|
||||||
|
|
||||||
|
// test case #1 tests proper functionality of non-blocking commands
|
||||||
|
{"startup mkdir " + osSenitiveTestDir, false, true},
|
||||||
|
|
||||||
|
// test case #2 tests handling of non-existant commands
|
||||||
|
{"startup " + strconv.Itoa(int(time.Now().UnixNano())), true, true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, test := range tests {
|
||||||
|
c := NewTestController(test.input)
|
||||||
|
_, err = Startup(c)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected no errors, got: %v", err)
|
||||||
|
}
|
||||||
|
err = c.Startup[0]()
|
||||||
|
if err != nil && !test.shouldExecutionErr {
|
||||||
|
t.Errorf("Test %d recieved an error of:\n%v", i, err)
|
||||||
|
}
|
||||||
|
err = os.Remove(osSenitiveTestDir)
|
||||||
|
if err != nil && !test.shouldRemoveErr {
|
||||||
|
t.Errorf("Test %d recieved an error of:\n%v", i, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue