c2499418ed
go test will only run tests in parallel within a single package. In this case the package test run time is exactly the same with or without t.Parallel() (~0.7s).
In generally we should avoid t.Parallel() as it causes a number of problems with `go test` not reporting failure messages correctly. I encountered one of these problems, which is what prompted this change. Since `t.Parallel` is not providing any benefit in this package, this commit removes it.
The change was automated with:
git grep -l 't.Parallel' | xargs sed -i -e '/t.Parallel/d'
88 lines
1.9 KiB
Go
88 lines
1.9 KiB
Go
package structs
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/pascaldekloe/goe/verify"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAgentStructs_CheckTypes(t *testing.T) {
|
|
svc := new(ServiceDefinition)
|
|
|
|
// Singular Check field works
|
|
svc.Check = CheckType{
|
|
ScriptArgs: []string{"/foo/bar"},
|
|
Interval: 10 * time.Second,
|
|
}
|
|
|
|
// Returns HTTP checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
HTTP: "http://foo/bar",
|
|
Interval: 10 * time.Second,
|
|
})
|
|
|
|
// Returns Script checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
ScriptArgs: []string{"/foo/bar"},
|
|
Interval: 10 * time.Second,
|
|
})
|
|
|
|
// Returns TTL checks
|
|
svc.Checks = append(svc.Checks, &CheckType{
|
|
TTL: 10 * time.Second,
|
|
})
|
|
|
|
// Validate checks
|
|
cases := []struct {
|
|
in *CheckType
|
|
err error
|
|
desc string
|
|
}{
|
|
{&CheckType{HTTP: "http://foo/baz"}, fmt.Errorf("Interval must be > 0 for Script, HTTP, or TCP checks"), "Missing interval"},
|
|
{&CheckType{TTL: -1}, fmt.Errorf("TTL must be > 0 for TTL checks"), "Negative TTL"},
|
|
{&CheckType{TTL: 20 * time.Second, Interval: 10 * time.Second}, fmt.Errorf("Interval and TTL cannot both be specified"), "Interval and TTL both set"},
|
|
}
|
|
for _, tc := range cases {
|
|
svc.Check = *tc.in
|
|
checks, err := svc.CheckTypes()
|
|
verify.Values(t, tc.desc, err.Error(), tc.err.Error())
|
|
if len(checks) != 0 {
|
|
t.Fatalf("bad: %#v", svc)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestServiceDefinitionValidate(t *testing.T) {
|
|
cases := []struct {
|
|
Name string
|
|
Modify func(*ServiceDefinition)
|
|
Err string
|
|
}{
|
|
{
|
|
"valid",
|
|
func(x *ServiceDefinition) {},
|
|
"",
|
|
},
|
|
}
|
|
|
|
for _, tc := range cases {
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
require := require.New(t)
|
|
service := TestServiceDefinition(t)
|
|
tc.Modify(service)
|
|
|
|
err := service.Validate()
|
|
if tc.Err == "" {
|
|
require.NoError(err)
|
|
} else {
|
|
require.Error(err)
|
|
require.Contains(strings.ToLower(err.Error()), strings.ToLower(tc.Err))
|
|
}
|
|
})
|
|
}
|
|
}
|