MM-49604: Fix race condition in test (#22128)
The AssertExpectations was being called after the store was closed. To fix it we move it to the last line. https://mattermost.atlassian.net/browse/MM-49604 ```release-note NONE
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
63f05ee1a3
Коммит
82077c9004
@@ -703,13 +703,13 @@ func TestVersionString(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestReplicaLagQuery(t *testing.T) {
|
func TestReplicaLagQuery(t *testing.T) {
|
||||||
t.Skip("MM-49604")
|
|
||||||
testDrivers := []string{
|
testDrivers := []string{
|
||||||
model.DatabaseDriverPostgres,
|
model.DatabaseDriverPostgres,
|
||||||
model.DatabaseDriverMysql,
|
model.DatabaseDriverMysql,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, driver := range testDrivers {
|
for _, driver := range testDrivers {
|
||||||
|
t.Run(driver, func(t *testing.T) {
|
||||||
settings := makeSqlSettings(driver)
|
settings := makeSqlSettings(driver)
|
||||||
var query string
|
var query string
|
||||||
var tableName string
|
var tableName string
|
||||||
@@ -730,7 +730,6 @@ func TestReplicaLagQuery(t *testing.T) {
|
|||||||
}}
|
}}
|
||||||
|
|
||||||
mockMetrics := &mocks.MetricsInterface{}
|
mockMetrics := &mocks.MetricsInterface{}
|
||||||
defer mockMetrics.AssertExpectations(t)
|
|
||||||
mockMetrics.On("SetReplicaLagAbsolute", tableName, float64(1))
|
mockMetrics.On("SetReplicaLagAbsolute", tableName, float64(1))
|
||||||
mockMetrics.On("SetReplicaLagTime", tableName, float64(1))
|
mockMetrics.On("SetReplicaLagTime", tableName, float64(1))
|
||||||
mockMetrics.On("RegisterDBCollector", mock.AnythingOfType("*sql.DB"), "master")
|
mockMetrics.On("RegisterDBCollector", mock.AnythingOfType("*sql.DB"), "master")
|
||||||
@@ -753,6 +752,8 @@ func TestReplicaLagQuery(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
err = store.ReplicaLagTime()
|
err = store.ReplicaLagTime()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
mockMetrics.AssertExpectations(t)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user