From e4a17d22a41f749a381100333a3b60df408f75ff Mon Sep 17 00:00:00 2001 From: John Eikenberry Date: Thu, 29 Jul 2021 13:20:20 -0700 Subject: [PATCH] remove all t.Parallel calls from tests Tests take near the same time without and are much easier to work with and debug if they are sequential. --- child/child_test.go | 17 ----------------- cli_test.go | 4 ---- config/auth_test.go | 5 ----- config/config_test.go | 4 ---- config/consul_test.go | 3 --- config/convert_test.go | 23 ----------------------- config/dedup_test.go | 3 --- config/env_test.go | 5 ----- config/exec_test.go | 3 --- config/mapstructure_test.go | 3 --- config/retry_test.go | 4 ---- config/ssl_test.go | 3 --- config/syslog_test.go | 3 --- config/template_test.go | 5 ----- config/transport_test.go | 3 --- config/vault_test.go | 4 ---- config/wait_test.go | 4 ---- dependency/catalog_datacenters_test.go | 3 --- dependency/catalog_node_test.go | 3 --- dependency/catalog_nodes_test.go | 3 --- dependency/catalog_service_test.go | 3 --- dependency/catalog_services_test.go | 3 --- dependency/connect_ca_test.go | 1 - dependency/connect_leaf_test.go | 3 --- dependency/dependency_test.go | 2 -- dependency/file_test.go | 3 --- dependency/health_service_test.go | 5 ----- dependency/kv_get_test.go | 3 --- dependency/kv_keys_test.go | 3 --- dependency/kv_list_test.go | 3 --- dependency/vault_agent_token_test.go | 1 - dependency/vault_list_test.go | 3 --- dependency/vault_read_test.go | 6 ------ dependency/vault_token_test.go | 2 -- dependency/vault_write_test.go | 4 ---- manager/dedup_test.go | 4 ---- manager/runner_test.go | 18 ------------------ signals/signals_test.go | 3 --- template/brain_test.go | 4 ---- template/funcs_test.go | 2 -- template/scratch_test.go | 7 ------- template/template_test.go | 2 -- 42 files changed, 190 deletions(-) diff --git a/child/child_test.go b/child/child_test.go index f75852276..50bdb96c7 100644 --- a/child/child_test.go +++ b/child/child_test.go @@ -31,7 +31,6 @@ func testChild(t *testing.T) *Child { } func TestNew(t *testing.T) { - t.Parallel() stdin := gatedio.NewByteBuffer() stdout := gatedio.NewByteBuffer() @@ -106,7 +105,6 @@ func TestNew(t *testing.T) { } func TestNew_errMissingCommand(t *testing.T) { - t.Parallel() _, err := New(nil) if err == nil { @@ -119,7 +117,6 @@ func TestNew_errMissingCommand(t *testing.T) { } func TestExitCh_noProcess(t *testing.T) { - t.Parallel() c := testChild(t) ch := c.ExitCh() @@ -129,7 +126,6 @@ func TestExitCh_noProcess(t *testing.T) { } func TestExitCh(t *testing.T) { - t.Parallel() c := testChild(t) if err := c.Start(); err != nil { @@ -144,7 +140,6 @@ func TestExitCh(t *testing.T) { } func TestPid_noProcess(t *testing.T) { - t.Parallel() c := testChild(t) pid := c.Pid() @@ -154,7 +149,6 @@ func TestPid_noProcess(t *testing.T) { } func TestPid(t *testing.T) { - t.Parallel() c := testChild(t) if err := c.Start(); err != nil { @@ -169,7 +163,6 @@ func TestPid(t *testing.T) { } func TestStart(t *testing.T) { - t.Parallel() c := testChild(t) @@ -204,7 +197,6 @@ func TestStart(t *testing.T) { } func TestSignal(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" @@ -235,7 +227,6 @@ func TestSignal(t *testing.T) { } func TestSignal_noProcess(t *testing.T) { - t.Parallel() c := testChild(t) if err := c.Signal(syscall.SIGUSR1); err != nil { @@ -245,7 +236,6 @@ func TestSignal_noProcess(t *testing.T) { } func TestReload_signal(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" @@ -277,7 +267,6 @@ func TestReload_signal(t *testing.T) { } func TestReload_noSignal(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" @@ -312,7 +301,6 @@ func TestReload_noSignal(t *testing.T) { } func TestReload_noProcess(t *testing.T) { - t.Parallel() c := testChild(t) c.reloadSignal = syscall.SIGUSR1 @@ -322,7 +310,6 @@ func TestReload_noProcess(t *testing.T) { } func TestKill_signal(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" @@ -352,7 +339,6 @@ func TestKill_signal(t *testing.T) { } func TestKill_noSignal(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" @@ -379,7 +365,6 @@ func TestKill_noSignal(t *testing.T) { } func TestKill_noProcess(t *testing.T) { - t.Parallel() c := testChild(t) c.killSignal = syscall.SIGUSR1 @@ -387,7 +372,6 @@ func TestKill_noProcess(t *testing.T) { } func TestStop_noWaitForSplay(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" c.args = []string{"-c", "trap 'echo one; exit' USR1; while true; do sleep 0.2; done"} @@ -420,7 +404,6 @@ func TestStop_noWaitForSplay(t *testing.T) { } func TestStop_childAlreadyDead(t *testing.T) { - t.Parallel() c := testChild(t) c.command = "sh" c.args = []string{"-c", "exit 1"} diff --git a/cli_test.go b/cli_test.go index a9102630e..659f569da 100644 --- a/cli_test.go +++ b/cli_test.go @@ -16,7 +16,6 @@ import ( ) func TestCLI_ParseFlags(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { @@ -736,7 +735,6 @@ func TestCLI_ParseFlags(t *testing.T) { } func TestCLI_Run(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -787,7 +785,6 @@ func TestCLI_Run(t *testing.T) { } t.Run("once", func(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { @@ -839,7 +836,6 @@ func TestCLI_Run(t *testing.T) { }) t.Run("reload", func(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { diff --git a/config/auth_test.go b/config/auth_test.go index dc73ed7b2..6fc9453b8 100644 --- a/config/auth_test.go +++ b/config/auth_test.go @@ -7,7 +7,6 @@ import ( ) func TestParseAuthConfig(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -54,7 +53,6 @@ func TestParseAuthConfig(t *testing.T) { } func TestAuthConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -89,7 +87,6 @@ func TestAuthConfig_Copy(t *testing.T) { } func TestAuthConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -206,7 +203,6 @@ func TestAuthConfig_Merge(t *testing.T) { } func TestAuthConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -246,7 +242,6 @@ func TestAuthConfig_Finalize(t *testing.T) { } func TestAuthConfig_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/config_test.go b/config/config_test.go index ac8464564..68a6a1c13 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -36,7 +36,6 @@ func testFile(t *testing.T, contents string) (path string, remove func()) { } func TestParse(t *testing.T) { - t.Parallel() testFilePath, remove := testFile(t, "") defer remove() @@ -1571,7 +1570,6 @@ func TestParse(t *testing.T) { } func TestFinalize(t *testing.T) { - t.Parallel() testFileContents := "testing123" testFilePath, remove := testFile(t, testFileContents) @@ -1676,7 +1674,6 @@ func TestFinalize(t *testing.T) { } func TestConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -1943,7 +1940,6 @@ func TestConfig_Merge(t *testing.T) { } func TestFromPath(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { diff --git a/config/consul_test.go b/config/consul_test.go index 4eee9f34b..88f4ed0c0 100644 --- a/config/consul_test.go +++ b/config/consul_test.go @@ -8,7 +8,6 @@ import ( ) func TestConsulConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -49,7 +48,6 @@ func TestConsulConfig_Copy(t *testing.T) { } func TestConsulConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -262,7 +260,6 @@ func TestConsulConfig_Merge(t *testing.T) { } func TestConsulConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/convert_test.go b/config/convert_test.go index be352b5ce..7030a0132 100644 --- a/config/convert_test.go +++ b/config/convert_test.go @@ -11,7 +11,6 @@ import ( ) func TestBool(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -38,7 +37,6 @@ func TestBool(t *testing.T) { } func TestBoolVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -68,7 +66,6 @@ func TestBoolVal(t *testing.T) { } func TestBoolGoString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -98,7 +95,6 @@ func TestBoolGoString(t *testing.T) { } func TestBoolPresent(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -128,7 +124,6 @@ func TestBoolPresent(t *testing.T) { } func TestFileMode(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -155,7 +150,6 @@ func TestFileMode(t *testing.T) { } func TestFileModeVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -185,7 +179,6 @@ func TestFileModeVal(t *testing.T) { } func TestFileModeGoString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -215,7 +208,6 @@ func TestFileModeGoString(t *testing.T) { } func TestFileModePresent(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -250,7 +242,6 @@ func TestFileModePresent(t *testing.T) { } func TestInt(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -277,7 +268,6 @@ func TestInt(t *testing.T) { } func TestIntVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -307,7 +297,6 @@ func TestIntVal(t *testing.T) { } func TestIntGoString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -337,7 +326,6 @@ func TestIntGoString(t *testing.T) { } func TestIntPresent(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -372,7 +360,6 @@ func TestIntPresent(t *testing.T) { } func TestSignal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -395,7 +382,6 @@ func TestSignal(t *testing.T) { } func TestSignalVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -425,7 +411,6 @@ func TestSignalVal(t *testing.T) { } func TestSignalGoString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -455,7 +440,6 @@ func TestSignalGoString(t *testing.T) { } func TestSignalPresent(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -490,7 +474,6 @@ func TestSignalPresent(t *testing.T) { } func TestString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -513,7 +496,6 @@ func TestString(t *testing.T) { } func TestStringVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -543,7 +525,6 @@ func TestStringVal(t *testing.T) { } func TestStringGoString(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -573,7 +554,6 @@ func TestStringGoString(t *testing.T) { } func TestStringPresent(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -608,7 +588,6 @@ func TestStringPresent(t *testing.T) { } func TestTimeDuration(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -631,7 +610,6 @@ func TestTimeDuration(t *testing.T) { } func TestTimeDurationVal(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -661,7 +639,6 @@ func TestTimeDurationVal(t *testing.T) { } func TestTimeDurationGoString(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/dedup_test.go b/config/dedup_test.go index cbfcc25c7..90a225a29 100644 --- a/config/dedup_test.go +++ b/config/dedup_test.go @@ -8,7 +8,6 @@ import ( ) func TestDedupConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -44,7 +43,6 @@ func TestDedupConfig_Copy(t *testing.T) { } func TestDedupConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -185,7 +183,6 @@ func TestDedupConfig_Merge(t *testing.T) { } func TestDedupConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/env_test.go b/config/env_test.go index 838ebab51..9f5d5798e 100644 --- a/config/env_test.go +++ b/config/env_test.go @@ -10,7 +10,6 @@ import ( ) func TestEnvConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -48,7 +47,6 @@ func TestEnvConfig_Copy(t *testing.T) { } func TestEnvConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -183,7 +181,6 @@ func TestEnvConfig_Merge(t *testing.T) { } func TestExecConfig_Env(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -275,7 +272,6 @@ func TestExecConfig_Env(t *testing.T) { } func TestEnvConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -307,7 +303,6 @@ func TestEnvConfig_Finalize(t *testing.T) { } func TestCombineLists(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/exec_test.go b/config/exec_test.go index 3a22708c4..2249af461 100644 --- a/config/exec_test.go +++ b/config/exec_test.go @@ -9,7 +9,6 @@ import ( ) func TestExecConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -49,7 +48,6 @@ func TestExecConfig_Copy(t *testing.T) { } func TestExecConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -286,7 +284,6 @@ func TestExecConfig_Merge(t *testing.T) { } func TestExecConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/mapstructure_test.go b/config/mapstructure_test.go index 7036d7db4..412a52f65 100644 --- a/config/mapstructure_test.go +++ b/config/mapstructure_test.go @@ -11,7 +11,6 @@ import ( ) func TestStringToFileModeFunc(t *testing.T) { - t.Parallel() f := StringToFileModeFunc() strType := reflect.TypeOf("") @@ -55,7 +54,6 @@ func TestStringToFileModeFunc(t *testing.T) { } func TestStringToWaitDurationHookFunc(t *testing.T) { - t.Parallel() f := StringToWaitDurationHookFunc() strType := reflect.TypeOf("") @@ -125,7 +123,6 @@ func TestStringToWaitDurationHookFunc(t *testing.T) { } func TestConsulStringToStructFunc(t *testing.T) { - t.Parallel() f := ConsulStringToStructFunc() strType := reflect.TypeOf("") diff --git a/config/retry_test.go b/config/retry_test.go index eb1a40268..071608d86 100644 --- a/config/retry_test.go +++ b/config/retry_test.go @@ -8,7 +8,6 @@ import ( ) func TestRetryFunc(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -158,7 +157,6 @@ func TestRetryFunc(t *testing.T) { } func TestRetryConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -202,7 +200,6 @@ func TestRetryConfig_Copy(t *testing.T) { } func TestRetryConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -346,7 +343,6 @@ func TestRetryConfig_Merge(t *testing.T) { } func TestRetryConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/ssl_test.go b/config/ssl_test.go index 5ba851f11..9b8f140dd 100644 --- a/config/ssl_test.go +++ b/config/ssl_test.go @@ -7,7 +7,6 @@ import ( ) func TestSSLConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -46,7 +45,6 @@ func TestSSLConfig_Copy(t *testing.T) { } func TestSSLConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -259,7 +257,6 @@ func TestSSLConfig_Merge(t *testing.T) { } func TestSSLConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/syslog_test.go b/config/syslog_test.go index 2adfad2b2..0f0545494 100644 --- a/config/syslog_test.go +++ b/config/syslog_test.go @@ -7,7 +7,6 @@ import ( ) func TestSyslogConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -42,7 +41,6 @@ func TestSyslogConfig_Copy(t *testing.T) { } func TestSyslogConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -159,7 +157,6 @@ func TestSyslogConfig_Merge(t *testing.T) { } func TestSyslogConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/template_test.go b/config/template_test.go index e233e25c5..89d8d5f7d 100644 --- a/config/template_test.go +++ b/config/template_test.go @@ -8,7 +8,6 @@ import ( ) func TestTemplateConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -52,7 +51,6 @@ func TestTemplateConfig_Copy(t *testing.T) { } func TestTemplateConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -409,7 +407,6 @@ func TestTemplateConfig_Merge(t *testing.T) { } func TestTemplateConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -471,7 +468,6 @@ func TestTemplateConfig_Finalize(t *testing.T) { } func TestTemplateConfig_Display(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -518,7 +514,6 @@ func TestTemplateConfig_Display(t *testing.T) { } func TestParseTemplateConfig(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/transport_test.go b/config/transport_test.go index 35273e60e..37ccf7941 100644 --- a/config/transport_test.go +++ b/config/transport_test.go @@ -8,7 +8,6 @@ import ( ) func TestTransportConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -47,7 +46,6 @@ func TestTransportConfig_Copy(t *testing.T) { } func TestTransportConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -260,7 +258,6 @@ func TestTransportConfig_Merge(t *testing.T) { } func TestTransportConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/vault_test.go b/config/vault_test.go index 80358fde3..99b2de923 100644 --- a/config/vault_test.go +++ b/config/vault_test.go @@ -8,7 +8,6 @@ import ( ) func TestVaultConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -53,7 +52,6 @@ func TestVaultConfig_Copy(t *testing.T) { } func TestVaultConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -338,7 +336,6 @@ func TestVaultConfig_Merge(t *testing.T) { } func TestVaultConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -513,7 +510,6 @@ func TestVaultConfig_Finalize(t *testing.T) { } func TestVaultConfig_TokenRenew(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/config/wait_test.go b/config/wait_test.go index 806693892..26e8743ff 100644 --- a/config/wait_test.go +++ b/config/wait_test.go @@ -8,7 +8,6 @@ import ( ) func TestWaitConfig_Copy(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -43,7 +42,6 @@ func TestWaitConfig_Copy(t *testing.T) { } func TestWaitConfig_Merge(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -160,7 +158,6 @@ func TestWaitConfig_Merge(t *testing.T) { } func TestWaitConfig_Finalize(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -200,7 +197,6 @@ func TestWaitConfig_Finalize(t *testing.T) { } func TestParseWaitConfig(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/catalog_datacenters_test.go b/dependency/catalog_datacenters_test.go index c22d267a5..70b42e953 100644 --- a/dependency/catalog_datacenters_test.go +++ b/dependency/catalog_datacenters_test.go @@ -13,7 +13,6 @@ func init() { } func TestNewCatalogDatacentersQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -44,7 +43,6 @@ func TestNewCatalogDatacentersQuery(t *testing.T) { } func TestCatalogDatacentersQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -143,7 +141,6 @@ func TestCatalogDatacentersQuery_Fetch(t *testing.T) { } func TestCatalogDatacentersQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/catalog_node_test.go b/dependency/catalog_node_test.go index 14506a027..c920e05a8 100644 --- a/dependency/catalog_node_test.go +++ b/dependency/catalog_node_test.go @@ -8,7 +8,6 @@ import ( ) func TestNewCatalogNodeQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -79,7 +78,6 @@ func TestNewCatalogNodeQuery(t *testing.T) { } func TestCatalogNodeQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -171,7 +169,6 @@ func TestCatalogNodeQuery_Fetch(t *testing.T) { } func TestCatalogNodeQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/catalog_nodes_test.go b/dependency/catalog_nodes_test.go index 918628ab3..e62a33e96 100644 --- a/dependency/catalog_nodes_test.go +++ b/dependency/catalog_nodes_test.go @@ -8,7 +8,6 @@ import ( ) func TestNewCatalogNodesQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -72,7 +71,6 @@ func TestNewCatalogNodesQuery(t *testing.T) { } func TestCatalogNodesQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -124,7 +122,6 @@ func TestCatalogNodesQuery_Fetch(t *testing.T) { } func TestCatalogNodesQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/catalog_service_test.go b/dependency/catalog_service_test.go index 07a27a58d..f92f09f63 100644 --- a/dependency/catalog_service_test.go +++ b/dependency/catalog_service_test.go @@ -8,7 +8,6 @@ import ( ) func TestNewCatalogServiceQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -144,7 +143,6 @@ func TestNewCatalogServiceQuery(t *testing.T) { } func TestCatalogServiceQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -232,7 +230,6 @@ func TestCatalogServiceQuery_Fetch(t *testing.T) { } func TestCatalogServiceQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/catalog_services_test.go b/dependency/catalog_services_test.go index 35291b492..60d05f474 100644 --- a/dependency/catalog_services_test.go +++ b/dependency/catalog_services_test.go @@ -8,7 +8,6 @@ import ( ) func TestNewCatalogServicesQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -55,7 +54,6 @@ func TestNewCatalogServicesQuery(t *testing.T) { } func TestCatalogServicesQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -104,7 +102,6 @@ func TestCatalogServicesQuery_Fetch(t *testing.T) { } func TestCatalogServicesQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/connect_ca_test.go b/dependency/connect_ca_test.go index f06d55448..e23b265cd 100644 --- a/dependency/connect_ca_test.go +++ b/dependency/connect_ca_test.go @@ -8,7 +8,6 @@ import ( ) func TestConnectCAQuery_Fetch(t *testing.T) { - t.Parallel() d := NewConnectCAQuery() raw, _, err := d.Fetch(testClients, nil) diff --git a/dependency/connect_leaf_test.go b/dependency/connect_leaf_test.go index 7c3934770..d2ded49e9 100644 --- a/dependency/connect_leaf_test.go +++ b/dependency/connect_leaf_test.go @@ -12,7 +12,6 @@ import ( ) func TestNewConnectLeafQuery(t *testing.T) { - t.Parallel() act := NewConnectLeafQuery("foo") act.stopCh = nil @@ -21,7 +20,6 @@ func TestNewConnectLeafQuery(t *testing.T) { } func TestConnectLeafQuery_Fetch(t *testing.T) { - t.Parallel() t.Run("empty-service", func(t *testing.T) { d := NewConnectLeafQuery("") @@ -74,7 +72,6 @@ func TestConnectLeafQuery_Fetch(t *testing.T) { } func TestConnectLeafQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/dependency_test.go b/dependency/dependency_test.go index 22f530fea..0cccd8d6b 100644 --- a/dependency/dependency_test.go +++ b/dependency/dependency_test.go @@ -205,7 +205,6 @@ func (v *vaultServer) deleteSecret(path string) error { } func TestCanShare(t *testing.T) { - t.Parallel() deps := []Dependency{ &CatalogNodeQuery{}, @@ -224,7 +223,6 @@ func TestCanShare(t *testing.T) { } func TestDeepCopyAndSortTags(t *testing.T) { - t.Parallel() tags := []string{"hello", "world", "these", "are", "tags", "foo:bar", "baz=qux"} expected := []string{"are", "baz=qux", "foo:bar", "hello", "tags", "these", "world"} diff --git a/dependency/file_test.go b/dependency/file_test.go index ca6dd834d..9d9923280 100644 --- a/dependency/file_test.go +++ b/dependency/file_test.go @@ -15,7 +15,6 @@ func init() { } func TestNewFileQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -56,7 +55,6 @@ func TestNewFileQuery(t *testing.T) { } func TestFileQuery_Fetch(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { @@ -190,7 +188,6 @@ func TestFileQuery_Fetch(t *testing.T) { } func TestFileQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/health_service_test.go b/dependency/health_service_test.go index 372cb7a94..c7b438dce 100644 --- a/dependency/health_service_test.go +++ b/dependency/health_service_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewHealthServiceQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -162,7 +161,6 @@ func TestNewHealthServiceQuery(t *testing.T) { } func TestHealthConnectServiceQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string in string @@ -219,7 +217,6 @@ func TestHealthConnectServiceQuery_Fetch(t *testing.T) { } func TestHealthServiceQuery_Fetch(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -384,7 +381,6 @@ func TestHealthServiceQuery_Fetch(t *testing.T) { } func TestHealthServiceQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -465,7 +461,6 @@ func TestHealthServiceQuery_String(t *testing.T) { } func TestHealthServiceQueryConnect_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/kv_get_test.go b/dependency/kv_get_test.go index 862ba423b..509b1d585 100644 --- a/dependency/kv_get_test.go +++ b/dependency/kv_get_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewKVGetQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -130,7 +129,6 @@ func TestNewKVGetQuery(t *testing.T) { } func TestKVGetQuery_Fetch(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "test-kv-get/key", "value") testConsul.SetKVString(t, "test-kv-get/key_empty", "") @@ -247,7 +245,6 @@ func TestKVGetQuery_Fetch(t *testing.T) { } func TestKVGetQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/kv_keys_test.go b/dependency/kv_keys_test.go index 59c7cf3cb..d77f2e99d 100644 --- a/dependency/kv_keys_test.go +++ b/dependency/kv_keys_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewKVKeysQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -145,7 +144,6 @@ func TestNewKVKeysQuery(t *testing.T) { } func TestKVKeysQuery_Fetch(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "test-kv-keys/prefix/foo", "bar") testConsul.SetKVString(t, "test-kv-keys/prefix/zip", "zap") @@ -264,7 +262,6 @@ func TestKVKeysQuery_Fetch(t *testing.T) { } func TestKVKeysQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/kv_list_test.go b/dependency/kv_list_test.go index d33efc443..1e5d2abe9 100644 --- a/dependency/kv_list_test.go +++ b/dependency/kv_list_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewKVListQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -145,7 +144,6 @@ func TestNewKVListQuery(t *testing.T) { } func TestKVListQuery_Fetch(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "test-kv-list/prefix/foo", "bar") testConsul.SetKVString(t, "test-kv-list/prefix/zip", "zap") @@ -315,7 +313,6 @@ func TestKVListQuery_Fetch(t *testing.T) { } func TestKVListQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/vault_agent_token_test.go b/dependency/vault_agent_token_test.go index 4084119ef..29166ac59 100644 --- a/dependency/vault_agent_token_test.go +++ b/dependency/vault_agent_token_test.go @@ -52,7 +52,6 @@ func TestVaultAgentTokenQuery_Fetch(t *testing.T) { } func TestVaultAgentTokenQuery_Fetch_missingFile(t *testing.T) { - t.Parallel() // Use a non-existant token file path. d, err := NewVaultAgentTokenQuery("/tmp/invalid-file") diff --git a/dependency/vault_list_test.go b/dependency/vault_list_test.go index 9992b7f4c..7c597c56e 100644 --- a/dependency/vault_list_test.go +++ b/dependency/vault_list_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewVaultListQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -66,7 +65,6 @@ func TestNewVaultListQuery(t *testing.T) { } func TestVaultListQuery_Fetch(t *testing.T) { - t.Parallel() clients, vault := testVaultServer(t, "listfetch", "1") secretsPath := vault.secretsPath @@ -209,7 +207,6 @@ func TestVaultListQuery_Fetch(t *testing.T) { } func TestVaultListQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/vault_read_test.go b/dependency/vault_read_test.go index d69c72ccb..a3002add0 100644 --- a/dependency/vault_read_test.go +++ b/dependency/vault_read_test.go @@ -15,7 +15,6 @@ import ( ) func TestNewVaultReadQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -87,7 +86,6 @@ func TestNewVaultReadQuery(t *testing.T) { } func TestVaultReadQuery_Fetch_KVv1(t *testing.T) { - t.Parallel() clients, vault := testVaultServer(t, "read_fetch_v1", "1") secretsPath := vault.secretsPath @@ -264,7 +262,6 @@ func TestVaultReadQuery_Fetch_KVv1(t *testing.T) { } func TestVaultReadQuery_Fetch_KVv2(t *testing.T) { - t.Parallel() clients, vault := testVaultServer(t, "read_fetch_v2", "2") secretsPath := vault.secretsPath @@ -521,7 +518,6 @@ func TestVaultReadQuery_Fetch_KVv2(t *testing.T) { // TestVaultReadQuery_Fetch_PKI_Anonymous asserts that vault.read can fetch a // pki ca public cert even even when running unauthenticated client. func TestVaultReadQuery_Fetch_PKI_Anonymous(t *testing.T) { - t.Parallel() clients := testClients err := clients.Vault().Sys().Mount("pki", &api.MountInput{ @@ -580,7 +576,6 @@ func TestVaultReadQuery_Fetch_PKI_Anonymous(t *testing.T) { // TestVaultReadQuery_Fetch_NonSecrets asserts that vault.read can fetch a // non-secret func TestVaultReadQuery_Fetch_NonSecrets(t *testing.T) { - t.Parallel() var err error @@ -640,7 +635,6 @@ func TestVaultReadQuery_Fetch_NonSecrets(t *testing.T) { } func TestVaultReadQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/vault_token_test.go b/dependency/vault_token_test.go index 53e2c104b..64a5edfab 100644 --- a/dependency/vault_token_test.go +++ b/dependency/vault_token_test.go @@ -9,7 +9,6 @@ import ( ) func TestNewVaultTokenQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -55,7 +54,6 @@ func TestNewVaultTokenQuery(t *testing.T) { } func TestVaultTokenQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/dependency/vault_write_test.go b/dependency/vault_write_test.go index 087f686c8..bd516561f 100644 --- a/dependency/vault_write_test.go +++ b/dependency/vault_write_test.go @@ -11,7 +11,6 @@ import ( ) func TestNewVaultWriteQuery(t *testing.T) { - t.Parallel() cases := []struct { name string @@ -73,7 +72,6 @@ func TestNewVaultWriteQuery(t *testing.T) { } func TestVaultWriteSecretKV_Fetch(t *testing.T) { - t.Parallel() // previously triggered a nil-pointer-deref panic in wq.Fetch() with KVv1 // due to writeSecret() returning nil for vaultSecret @@ -176,7 +174,6 @@ func TestVaultWriteSecretKV_Fetch(t *testing.T) { } func TestVaultWriteQuery_Fetch(t *testing.T) { - t.Parallel() clients := testClients @@ -365,7 +362,6 @@ func TestVaultWriteQuery_Fetch(t *testing.T) { } func TestVaultWriteQuery_String(t *testing.T) { - t.Parallel() cases := []struct { name string diff --git a/manager/dedup_test.go b/manager/dedup_test.go index 16cdeb8ec..7d891fbd9 100644 --- a/manager/dedup_test.go +++ b/manager/dedup_test.go @@ -9,7 +9,6 @@ import ( ) func TestDedup_StartStop(t *testing.T) { - t.Parallel() dedup := testDedupManager(t, nil) @@ -23,7 +22,6 @@ func TestDedup_StartStop(t *testing.T) { } func TestDedup_IsLeader(t *testing.T) { - t.Parallel() // Create a template tmpl, err := template.NewTemplate(&template.NewTemplateInput{ @@ -53,7 +51,6 @@ func TestDedup_IsLeader(t *testing.T) { } func TestDedup_UpdateDeps(t *testing.T) { - t.Parallel() // Create a template tmpl, err := template.NewTemplate(&template.NewTemplateInput{ @@ -93,7 +90,6 @@ func TestDedup_UpdateDeps(t *testing.T) { } func TestDedup_FollowerUpdate(t *testing.T) { - t.Parallel() // hangs on this sometimes, so make as short as possible lockWaitTime = 100 * time.Millisecond diff --git a/manager/runner_test.go b/manager/runner_test.go index de2daa324..92aed8a98 100644 --- a/manager/runner_test.go +++ b/manager/runner_test.go @@ -16,7 +16,6 @@ import ( ) func TestRunner_Receive(t *testing.T) { - t.Parallel() c := config.TestConfig(&config.Config{Once: true}) r, err := NewRunner(c, true) @@ -25,7 +24,6 @@ func TestRunner_Receive(t *testing.T) { } t.Run("adds_to_brain", func(t *testing.T) { - t.Parallel() d, err := dep.NewKVGetQuery("foo") if err != nil { @@ -47,7 +45,6 @@ func TestRunner_Receive(t *testing.T) { }) t.Run("skips_brain_if_not_watching", func(t *testing.T) { - t.Parallel() d, err := dep.NewKVGetQuery("zip") if err != nil { @@ -442,7 +439,6 @@ func TestRunner_Run(t *testing.T) { for i, tc := range cases { tc := tc t.Run(fmt.Sprintf("%d_%s", i, tc.name), func(t *testing.T) { - t.Parallel() var out bytes.Buffer @@ -473,10 +469,8 @@ func TestRunner_Run(t *testing.T) { } func TestRunner_Start(t *testing.T) { - t.Parallel() t.Run("store_pid", func(t *testing.T) { - t.Parallel() pid, err := ioutil.TempFile("", "") if err != nil { @@ -526,7 +520,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("run_no_deps", func(t *testing.T) { - t.Parallel() out, err := ioutil.TempFile("", "") if err != nil { @@ -570,7 +563,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("single_dependency", func(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "single-dep-foo", "bar") @@ -619,7 +611,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("multipass", func(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "multipass-foo", "multipass-bar") testConsul.SetKVString(t, "multipass-bar", "zip") @@ -669,7 +660,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("exec", func(t *testing.T) { - t.Parallel() out, err := ioutil.TempFile("", "") if err != nil { @@ -725,7 +715,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("exec_once", func(t *testing.T) { - t.Parallel() out, err := ioutil.TempFile("", "") if err != nil { @@ -783,7 +772,6 @@ func TestRunner_Start(t *testing.T) { // Exec would run before template rendering if Wait was defined. t.Run("exec-wait", func(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "exec-wait-foo", "foo") @@ -853,7 +841,6 @@ func TestRunner_Start(t *testing.T) { // a wait parameter call an exec function // https://github.com/hashicorp/consul-template/issues/1043 t.Run("multi-template-exec", func(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "multi-exec-wait-foo", "bar") testConsul.SetKVString(t, "multi-exec-wait-bar", "bat") @@ -928,7 +915,6 @@ func TestRunner_Start(t *testing.T) { }) t.Run("render_in_memory", func(t *testing.T) { - t.Parallel() testConsul.SetKVString(t, "render-in-memory", "foo") @@ -987,12 +973,10 @@ func TestRunner_Start(t *testing.T) { } func TestRunner_quiescence(t *testing.T) { - t.Parallel() tpl := &template.Template{} t.Run("min", func(t *testing.T) { - t.Parallel() ch := make(chan *template.Template, 1) q := newQuiescence(ch, @@ -1023,7 +1007,6 @@ func TestRunner_quiescence(t *testing.T) { // Single snooze case. t.Run("snooze", func(t *testing.T) { - t.Parallel() ch := make(chan *template.Template, 1) q := newQuiescence(ch, @@ -1051,7 +1034,6 @@ func TestRunner_quiescence(t *testing.T) { // Max time case. t.Run("max", func(t *testing.T) { - t.Parallel() ch := make(chan *template.Template, 1) q := newQuiescence(ch, diff --git a/signals/signals_test.go b/signals/signals_test.go index a74b571ca..b1ad2fb04 100644 --- a/signals/signals_test.go +++ b/signals/signals_test.go @@ -7,7 +7,6 @@ import ( ) func TestParse(t *testing.T) { - t.Parallel() s, err := Parse("SIGHUP") if err != nil { @@ -19,7 +18,6 @@ func TestParse(t *testing.T) { } func TestParse_case(t *testing.T) { - t.Parallel() s, err := Parse("sighup") if err != nil { @@ -31,7 +29,6 @@ func TestParse_case(t *testing.T) { } func TestParse_invalid(t *testing.T) { - t.Parallel() _, err := Parse("neverasignalnope") if err == nil { diff --git a/template/brain_test.go b/template/brain_test.go index ae020196c..e662807a4 100644 --- a/template/brain_test.go +++ b/template/brain_test.go @@ -8,7 +8,6 @@ import ( ) func TestNewBrain(t *testing.T) { - t.Parallel() b := NewBrain() if b.data == nil { @@ -21,7 +20,6 @@ func TestNewBrain(t *testing.T) { } func TestRecall(t *testing.T) { - t.Parallel() b := NewBrain() d, err := dep.NewCatalogNodesQuery("") @@ -50,7 +48,6 @@ func TestRecall(t *testing.T) { } func TestForceSet(t *testing.T) { - t.Parallel() b := NewBrain() d, err := dep.NewCatalogNodesQuery("") @@ -79,7 +76,6 @@ func TestForceSet(t *testing.T) { } func TestForget(t *testing.T) { - t.Parallel() b := NewBrain() d, err := dep.NewCatalogNodesQuery("") diff --git a/template/funcs_test.go b/template/funcs_test.go index 84767e5a0..9ab49d15d 100644 --- a/template/funcs_test.go +++ b/template/funcs_test.go @@ -14,7 +14,6 @@ import ( // the tests here are for ancillary code only. func TestFileSandbox(t *testing.T) { - t.Parallel() // while most of the function can be tested lexigraphically, // we need to be able to walk actual symlinks. _, filename, _, _ := runtime.Caller(0) @@ -86,7 +85,6 @@ func TestFileSandbox(t *testing.T) { } func Test_byMeta(t *testing.T) { - t.Parallel() svcA := &dep.HealthService{ ServiceMeta: map[string]string{ "version": "v2", diff --git a/template/scratch_test.go b/template/scratch_test.go index 4aa2dbc6c..d5161560f 100644 --- a/template/scratch_test.go +++ b/template/scratch_test.go @@ -7,7 +7,6 @@ import ( ) func TestScratch_Key(t *testing.T) { - t.Parallel() cases := []struct { name string s *Scratch @@ -43,7 +42,6 @@ func TestScratch_Key(t *testing.T) { } func TestScratch_Get(t *testing.T) { - t.Parallel() cases := []struct { name string s *Scratch @@ -79,7 +77,6 @@ func TestScratch_Get(t *testing.T) { } func TestScratch_Set(t *testing.T) { - t.Parallel() cases := []struct { name string f func(*Scratch) @@ -123,7 +120,6 @@ func TestScratch_Set(t *testing.T) { } func TestScratch_SetX(t *testing.T) { - t.Parallel() cases := []struct { name string f func(*Scratch) @@ -167,7 +163,6 @@ func TestScratch_SetX(t *testing.T) { } func TestScratch_MapSet(t *testing.T) { - t.Parallel() cases := []struct { name string f func(*Scratch) @@ -219,7 +214,6 @@ func TestScratch_MapSet(t *testing.T) { } func TestScratch_MapSetX(t *testing.T) { - t.Parallel() cases := []struct { name string f func(*Scratch) @@ -271,7 +265,6 @@ func TestScratch_MapSetX(t *testing.T) { } func TestScratch_MapValues(t *testing.T) { - t.Parallel() cases := []struct { name string s *Scratch diff --git a/template/template_test.go b/template/template_test.go index 138628c1e..a810535be 100644 --- a/template/template_test.go +++ b/template/template_test.go @@ -16,7 +16,6 @@ import ( ) func TestNewTemplate(t *testing.T) { - t.Parallel() f, err := ioutil.TempFile("", "") if err != nil { t.Fatal(err) @@ -126,7 +125,6 @@ func TestNewTemplate(t *testing.T) { } func TestTemplate_Execute(t *testing.T) { - t.Parallel() now = func() time.Time { return time.Unix(0, 0).UTC() } f, err := ioutil.TempFile("", "")