From 313ec1dd7e8ea0d9a20e9a5deec1440e08b49f47 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Wed, 4 Mar 2020 11:09:29 -0500 Subject: [PATCH] csi: remove DevDisableBootstrap flag from tests (#7267) In #7252 we removed the `DevDisableBootstrap` flag to require tests to honor only `BootstrapExpect`, in order to reduce a source of test flakiness. This changeset applies the same fix to the CSI tests. --- nomad/client_csi_endpoint_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nomad/client_csi_endpoint_test.go b/nomad/client_csi_endpoint_test.go index 48774fc12..4be3ce99d 100644 --- a/nomad/client_csi_endpoint_test.go +++ b/nomad/client_csi_endpoint_test.go @@ -51,11 +51,9 @@ func TestClientCSIController_AttachVolume_Forwarded(t *testing.T) { require := require.New(t) // Start a server and client - s1, cleanupS1 := TestServer(t, nil) + s1, cleanupS1 := TestServer(t, func(c *Config) { c.BootstrapExpect = 2 }) defer cleanupS1() - s2, cleanupS2 := TestServer(t, func(c *Config) { - c.DevDisableBootstrap = true - }) + s2, cleanupS2 := TestServer(t, func(c *Config) { c.BootstrapExpect = 2 }) defer cleanupS2() TestJoin(t, s1, s2) testutil.WaitForLeader(t, s1.RPC)