diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /workhorse/config_test.go | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'workhorse/config_test.go')
-rw-r--r-- | workhorse/config_test.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/workhorse/config_test.go b/workhorse/config_test.go index f9d12bd5e2b..b1b04cb9a65 100644 --- a/workhorse/config_test.go +++ b/workhorse/config_test.go @@ -16,12 +16,20 @@ import ( "gitlab.com/gitlab-org/gitlab-workhorse/internal/upstream" ) +func TestDefaultConfig(t *testing.T) { + _, cfg, err := buildConfig("test", []string{"-config", "/dev/null"}) + require.NoError(t, err, "build config") + + require.Equal(t, 0*time.Second, cfg.ShutdownTimeout.Duration) +} + func TestConfigFile(t *testing.T) { f, err := ioutil.TempFile("", "workhorse-config-test") require.NoError(t, err) defer os.Remove(f.Name()) data := ` +shutdown_timeout = "60s" [redis] password = "redis password" [object_storage] @@ -43,6 +51,7 @@ max_scaler_procs = 123 require.Equal(t, "redis password", cfg.Redis.Password) require.Equal(t, "test provider", cfg.ObjectStorageCredentials.Provider) require.Equal(t, uint32(123), cfg.ImageResizerConfig.MaxScalerProcs, "image resizer max_scaler_procs") + require.Equal(t, 60*time.Second, cfg.ShutdownTimeout.Duration) } func TestConfigErrorHelp(t *testing.T) { |