testing: remove old config.Build version

DefaultConfig already sets the version to version.Version, so by removing this
our tests will run with the version that matches the code.
This commit is contained in:
Daniel Nephin 2021-12-09 18:57:22 -05:00
parent 336a234927
commit 74e92316de
2 changed files with 13 additions and 12 deletions

View File

@ -164,8 +164,6 @@ func testServerConfig(t *testing.T) (string, *Config) {
config.ServerHealthInterval = 50 * time.Millisecond
config.AutopilotInterval = 100 * time.Millisecond
config.Build = "1.7.2"
config.CoordinateUpdatePeriod = 100 * time.Millisecond
config.LeaveDrainTime = 1 * time.Millisecond

View File

@ -4,9 +4,10 @@ import (
"os"
"testing"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/testrpc"
"github.com/stretchr/testify/require"
)
func TestLeader_SystemMetadata_CRUD(t *testing.T) {
@ -32,10 +33,10 @@ func TestLeader_SystemMetadata_CRUD(t *testing.T) {
state := srv.fsm.State()
// Initially has no entries
// Initially has one entry for virtual-ips feature flag
_, entries, err := state.SystemMetadataList(nil)
require.NoError(t, err)
require.Len(t, entries, 0)
require.Len(t, entries, 1)
// Create 3
require.NoError(t, srv.setSystemMetadataKey("key1", "val1"))
@ -52,12 +53,13 @@ func TestLeader_SystemMetadata_CRUD(t *testing.T) {
_, entries, err = state.SystemMetadataList(nil)
require.NoError(t, err)
require.Len(t, entries, 3)
require.Len(t, entries, 4)
require.Equal(t, map[string]string{
"key1": "val1",
"key2": "val2",
"key3": "",
structs.SystemMetadataVirtualIPsEnabled: "true",
"key1": "val1",
"key2": "val2",
"key3": "",
}, mapify(entries))
// Update one and delete one.
@ -66,10 +68,11 @@ func TestLeader_SystemMetadata_CRUD(t *testing.T) {
_, entries, err = state.SystemMetadataList(nil)
require.NoError(t, err)
require.Len(t, entries, 2)
require.Len(t, entries, 3)
require.Equal(t, map[string]string{
"key2": "val2",
"key3": "val3",
structs.SystemMetadataVirtualIPsEnabled: "true",
"key2": "val2",
"key3": "val3",
}, mapify(entries))
}