kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-03 17:05:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

template: fix test assertion to be compatible between CE/ENT (#18957)

Browse Source 
The template hook emits an error when the task has a Consul block that requires
WI but there's no WI. The exact error message we get depends on whether we're
running in CE or ENT. Update the test assertion so that we can tolerate this
difference without building ENT-specific test files.
This commit is contained in:
Tim Gross
2023-11-01 13:26:45 -04:00
committed by GitHub
parent e1acf72eb5
commit 483e78615d
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/allocrunner/taskrunner/template_hook_test.go
View File

@@ -58,45 +58,39 @@ func Test_templateHook_Prestart_ConsulWI(t *testing.T) {
tests := []struct {
name string
req *interfaces.TaskPrestartRequest
wantErr bool
wantErrMsg string
consulToken string
}{
{
"task with no Consul WI",
&interfaces.TaskPrestartRequest{
name: "task with no Consul WI",
req: &interfaces.TaskPrestartRequest{
Task: &structs.Task{},
TaskDir: &allocdir.TaskDir{Dir: "foo"},
},
false,
"",
"",
},
{
"task with Consul WI but no corresponding identity",
&interfaces.TaskPrestartRequest{
name: "task with Consul WI but no corresponding identity",
req: &interfaces.TaskPrestartRequest{
Task: &structs.Task{
Name: "foo",
Consul: &structs.Consul{Cluster: "bar"},
},
TaskDir: &allocdir.TaskDir{Dir: "foo"},
},
true,
"consul tokens for cluster default and identity consul_bar requested by task foo not found",
"",
// note: the exact message will vary between CE and ENT because they
// have different helpers for Consul cluster name lookup
wantErrMsg: "not found",
},
{
"task with Consul WI",
&interfaces.TaskPrestartRequest{
name: "task with Consul WI",
req: &interfaces.TaskPrestartRequest{
Task: &structs.Task{
Name: "foo",
Consul: &structs.Consul{Cluster: "default"},
},
TaskDir: &allocdir.TaskDir{Dir: "foo"},
},
false,
"",
hr.GetConsulTokens()[structs.ConsulDefaultCluster]["consul_default"],
consulToken: hr.GetConsulTokens()[structs.ConsulDefaultCluster]["consul_default"],
},
}
for _, tt := range tests {
@@ -109,9 +103,9 @@ func Test_templateHook_Prestart_ConsulWI(t *testing.T) {
}
err := h.Prestart(context.Background(), tt.req, nil)
if tt.wantErr {
if tt.wantErrMsg != "" {
must.NotNil(t, err)
must.Eq(t, tt.wantErrMsg, err.Error())
must.ErrorContains(t, err, tt.wantErrMsg)
} else {
must.Nil(t, err)
}