From efa071d978beea1e6d43ae34286e5c92d5aad809 Mon Sep 17 00:00:00 2001 From: Ibrahim Serdar Acikgoz Date: Tue, 8 Sep 2020 12:44:18 +0300 Subject: [PATCH] [MM-27967] api4/config_test: fix flaky test if siteurl is already set (#15403) * api4/config_test: fix flaky test if siteurl is already set * api4/apitelib enforce siteurl not set --- api4/apitestlib.go | 1 + api4/config_test.go | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 2475349c66..14788611db 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -117,6 +117,7 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent *cfg.TeamSettings.MaxUsersPerTeam = 50 *cfg.RateLimitSettings.Enable = false *cfg.EmailSettings.SendEmailNotifications = true + *cfg.ServiceSettings.SiteURL = "" // Disable sniffing, otherwise elastic client fails to connect to docker node // More details: https://github.com/olivere/elastic/wiki/Sniffing diff --git a/api4/config_test.go b/api4/config_test.go index cd999ec79c..d7d12e4a55 100644 --- a/api4/config_test.go +++ b/api4/config_test.go @@ -4,7 +4,6 @@ package api4 import ( - "fmt" "net/http" "os" "strings" @@ -146,7 +145,7 @@ func TestUpdateConfig(t *testing.T) { require.Equal(t, SiteName, cfg.TeamSettings.SiteName, "It should update the SiteName") t.Run("Should set defaults for missing fields", func(t *testing.T) { - _, appErr := th.SystemAdminClient.DoApiPut(th.SystemAdminClient.GetConfigRoute(), fmt.Sprintf(`{"ServiceSettings":{"SiteURL":"%s"}}`, *cfg.ServiceSettings.SiteURL)) + _, appErr := th.SystemAdminClient.DoApiPut(th.SystemAdminClient.GetConfigRoute(), "{}") require.Nil(t, appErr) })