mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests: Check for chasquid executable existance before starting test server

Browse source 
Avoids the race when maddy is killed so early it cannot perform
proper cleanup and this casues test to fail.
This commit is contained in:
fox.cpp 2020-12-13 19:48:42 +03:00
parent 178579d78a
commit 13d3a8bf5d
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/dovecot_sasld_test.go
View file

@ -88,14 +88,6 @@ Xi3olS9rB0J+Rvjz
-----END PRIVATE KEY-----` -----END PRIVATE KEY-----`
func runChasquid(t *testing.T, authClientPath string) (string, *exec.Cmd) { func runChasquid(t *testing.T, authClientPath string) (string, *exec.Cmd) {
chasquidExec, err := exec.LookPath(ChasquidExecutable)
if err != nil {
if errors.Is(err, exec.ErrNotFound) {
t.Skip("No chasquid executable found, skipping interop. tests")
}
t.Fatal(err)
}
tempDir, err := ioutil.TempDir("", "maddy-chasquid-interop-") tempDir, err := ioutil.TempDir("", "maddy-chasquid-interop-")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -129,7 +121,7 @@ func runChasquid(t *testing.T, authClientPath string) (string, *exec.Cmd) {
t.Fatal(err) t.Fatal(err)
} }
cmd := exec.Command(chasquidExec, "-v=2", "-config_dir", tempDir) cmd := exec.Command(ChasquidExecutable, "-v=2", "-config_dir", tempDir)
t.Log("Launching", cmd.String()) t.Log("Launching", cmd.String())
stderr, err := cmd.StderrPipe() stderr, err := cmd.StderrPipe()
if err != nil { if err != nil {
@ -173,6 +165,14 @@ func cleanChasquid(t *testing.T, tempDir string, cmd *exec.Cmd) {
func TestSASLServerWithChasquid(tt *testing.T) { func TestSASLServerWithChasquid(tt *testing.T) {
tt.Parallel() tt.Parallel()
_, err := exec.LookPath(ChasquidExecutable)
if err != nil {
if errors.Is(err, exec.ErrNotFound) {
tt.Skip("No chasquid executable found, skipping interop. tests")
}
tt.Fatal(err)
}
t := tests.NewT(tt) t := tests.NewT(tt)
t.DNS(nil) t.DNS(nil)
t.Port("smtp") t.Port("smtp")