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

cleanup: remove usage of consul/sdk/testutil/retry (#15609)

Browse Source 
This PR removes usages of `consul/sdk/testutil/retry`, as part of the
ongoing effort to remove use of any non-API module from Consul.

There is one remanining usage in the helper/freeport package, but that
will get removed as part of #15589
This commit is contained in:
Seth Hoenig
2023-01-02 08:06:20 -06:00
committed by GitHub
parent 1584496d96
commit 2609f6a137
4 changed files with 146 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
internal/testing/apitests/operator_autopilot_test.go
View File

@@ -4,52 +4,55 @@ import (
"fmt"
"testing"
"github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/testutil"
"github.com/stretchr/testify/require"
"github.com/shoenig/test/must"
"github.com/shoenig/test/wait"
)
func TestAPI_OperatorAutopilotGetSetConfiguration(t *testing.T) {
ci.Parallel(t)
require := require.New(t)
c, s := makeClient(t, nil, nil)
defer s.Stop()
operator := c.Operator()
var config *api.AutopilotConfiguration
retry.Run(t, func(r *retry.R) {
var err error
var err error
f := func() error {
config, _, err = operator.AutopilotGetConfiguration(nil)
r.Check(err)
})
require.True(config.CleanupDeadServers)
return err
}
must.Wait(t, wait.InitialSuccess(wait.ErrorFunc(f)))
must.True(t, config.CleanupDeadServers)
// Change a config setting
newConf := &api.AutopilotConfiguration{CleanupDeadServers: false}
_, err := operator.AutopilotSetConfiguration(newConf, nil)
require.Nil(err)
_, err = operator.AutopilotSetConfiguration(newConf, nil)
must.NoError(t, err)
config, _, err = operator.AutopilotGetConfiguration(nil)
require.Nil(err)
require.False(config.CleanupDeadServers)
must.NoError(t, err)
must.False(t, config.CleanupDeadServers)
}
func TestAPI_OperatorAutopilotCASConfiguration(t *testing.T) {
ci.Parallel(t)
require := require.New(t)
c, s := makeClient(t, nil, nil)
defer s.Stop()
operator := c.Operator()
var config *api.AutopilotConfiguration
retry.Run(t, func(r *retry.R) {
var err error
var err error
f := func() error {
config, _, err = operator.AutopilotGetConfiguration(nil)
r.Check(err)
})
require.True(config.CleanupDeadServers)
return err
}
must.Wait(t, wait.InitialSuccess(wait.ErrorFunc(f)))
must.True(t, config.CleanupDeadServers)
// Pass an invalid ModifyIndex
{
@@ -57,9 +60,10 @@ func TestAPI_OperatorAutopilotCASConfiguration(t *testing.T) {
CleanupDeadServers: false,
ModifyIndex: config.ModifyIndex - 1,
}
resp, _, err := operator.AutopilotCASConfiguration(newConf, nil)
require.Nil(err)
require.False(resp)
var apState bool
apState, _, err = operator.AutopilotCASConfiguration(newConf, nil)
must.NoError(t, err)
must.False(t, apState)
}
// Pass a valid ModifyIndex
@@ -68,9 +72,10 @@ func TestAPI_OperatorAutopilotCASConfiguration(t *testing.T) {
CleanupDeadServers: false,
ModifyIndex: config.ModifyIndex,
}
resp, _, err := operator.AutopilotCASConfiguration(newConf, nil)
require.Nil(err)
require.True(resp)
var apState bool
apState, _, err = operator.AutopilotCASConfiguration(newConf, nil)
must.NoError(t, err)
must.True(t, apState)
}
}

83
internal/testing/apitests/operator_test.go
View File

@@ -3,28 +3,29 @@ package apitests
import (
"testing"
"github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/ci"
"github.com/stretchr/testify/require"
"github.com/shoenig/test/must"
"github.com/shoenig/test/wait"
)
func TestAPI_OperatorSchedulerGetSetConfiguration(t *testing.T) {
ci.Parallel(t)
require := require.New(t)
c, s := makeClient(t, nil, nil)
defer s.Stop()
operator := c.Operator()
var config *api.SchedulerConfigurationResponse
retry.Run(t, func(r *retry.R) {
var err error
var err error
f := func() error {
config, _, err = operator.SchedulerGetConfiguration(nil)
r.Check(err)
})
require.True(config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
require.False(config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
require.False(config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
return err
}
must.Wait(t, wait.InitialSuccess(wait.ErrorFunc(f)))
must.True(t, config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
must.False(t, config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
must.False(t, config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
// Change a config setting
newConf := &api.SchedulerConfiguration{
@@ -35,34 +36,34 @@ func TestAPI_OperatorSchedulerGetSetConfiguration(t *testing.T) {
},
}
resp, wm, err := operator.SchedulerSetConfiguration(newConf, nil)
require.Nil(err)
require.NotZero(wm.LastIndex)
// non CAS requests should update on success
require.True(resp.Updated)
must.NoError(t, err)
must.Positive(t, wm.LastIndex)
must.True(t, resp.Updated) // non CAS requests should update on success
config, _, err = operator.SchedulerGetConfiguration(nil)
require.Nil(err)
require.False(config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
require.True(config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
require.True(config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
must.NoError(t, err)
must.False(t, config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
must.True(t, config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
must.True(t, config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
}
func TestAPI_OperatorSchedulerCASConfiguration(t *testing.T) {
ci.Parallel(t)
require := require.New(t)
c, s := makeClient(t, nil, nil)
defer s.Stop()
operator := c.Operator()
var config *api.SchedulerConfigurationResponse
retry.Run(t, func(r *retry.R) {
var err error
var err error
f := func() error {
config, _, err = operator.SchedulerGetConfiguration(nil)
r.Check(err)
})
require.True(config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
require.False(config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
require.False(config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
return err
}
must.Wait(t, wait.InitialSuccess(wait.ErrorFunc(f)))
must.True(t, config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
must.False(t, config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
must.False(t, config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
// Pass an invalid ModifyIndex
{
@@ -70,10 +71,12 @@ func TestAPI_OperatorSchedulerCASConfiguration(t *testing.T) {
PreemptionConfig: api.PreemptionConfig{SystemSchedulerEnabled: false, BatchSchedulerEnabled: true},
ModifyIndex: config.SchedulerConfig.ModifyIndex - 1,
}
resp, wm, err := operator.SchedulerCASConfiguration(newConf, nil)
require.Nil(err)
require.NotZero(wm.LastIndex)
require.False(resp.Updated)
var resp *api.SchedulerSetConfigurationResponse
var wm *api.WriteMeta
resp, wm, err = operator.SchedulerCASConfiguration(newConf, nil)
must.NoError(t, err)
must.Positive(t, wm.LastIndex)
must.False(t, resp.Updated)
}
// Pass a valid ModifyIndex
@@ -82,15 +85,17 @@ func TestAPI_OperatorSchedulerCASConfiguration(t *testing.T) {
PreemptionConfig: api.PreemptionConfig{SystemSchedulerEnabled: false, BatchSchedulerEnabled: true},
ModifyIndex: config.SchedulerConfig.ModifyIndex,
}
resp, wm, err := operator.SchedulerCASConfiguration(newConf, nil)
require.Nil(err)
require.NotZero(wm.LastIndex)
require.True(resp.Updated)
var resp *api.SchedulerSetConfigurationResponse
var wm *api.WriteMeta
resp, wm, err = operator.SchedulerCASConfiguration(newConf, nil)
must.NoError(t, err)
must.Positive(t, wm.LastIndex)
must.True(t, resp.Updated)
}
config, _, err := operator.SchedulerGetConfiguration(nil)
require.Nil(err)
require.False(config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
require.True(config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
require.False(config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
config, _, err = operator.SchedulerGetConfiguration(nil)
must.NoError(t, err)
must.False(t, config.SchedulerConfig.PreemptionConfig.SystemSchedulerEnabled)
must.True(t, config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled)
must.False(t, config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled)
}