mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Don't multiple the interval value by 1ms in the mock

Browse source 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier 2018-09-12 10:20:34 +02:00
parent 4900405d2f
commit 1cee5b5b06
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
discovery/manager_test.go
View file

@ -65,7 +65,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
"tp1": { "tp1": {
{ {
targetGroups: []targetgroup.Group{}, targetGroups: []targetgroup.Group{},
interval: 5, interval: 5 * time.Millisecond,
}, },
}, },
}, },
@ -79,19 +79,19 @@ func TestTargetUpdatesOrder(t *testing.T) {
"tp1": { "tp1": {
{ {
targetGroups: []targetgroup.Group{}, targetGroups: []targetgroup.Group{},
interval: 5, interval: 5 * time.Millisecond,
}, },
}, },
"tp2": { "tp2": {
{ {
targetGroups: []targetgroup.Group{}, targetGroups: []targetgroup.Group{},
interval: 200, interval: 200 * time.Millisecond,
}, },
}, },
"tp3": { "tp3": {
{ {
targetGroups: []targetgroup.Group{}, targetGroups: []targetgroup.Group{},
interval: 100, interval: 100 * time.Millisecond,
}, },
}, },
}, },
@ -156,7 +156,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "3"}}, Targets: []model.LabelSet{{"__instance__": "3"}},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
}, },
}, },
@ -214,7 +214,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{}, Targets: []model.LabelSet{},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
}, },
}, },
@ -273,7 +273,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "1"}}, Targets: []model.LabelSet{{"__instance__": "1"}},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
}, },
}, },
@ -319,7 +319,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "2"}}, Targets: []model.LabelSet{{"__instance__": "2"}},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -332,7 +332,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "4"}}, Targets: []model.LabelSet{{"__instance__": "4"}},
}, },
}, },
interval: 500, interval: 500 * time.Millisecond,
}, },
}, },
"tp2": { "tp2": {
@ -347,7 +347,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "6"}}, Targets: []model.LabelSet{{"__instance__": "6"}},
}, },
}, },
interval: 100, interval: 100 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -360,7 +360,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "8"}}, Targets: []model.LabelSet{{"__instance__": "8"}},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
}, },
}, },
@ -470,7 +470,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "2"}}, Targets: []model.LabelSet{{"__instance__": "2"}},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -483,7 +483,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "4"}}, Targets: []model.LabelSet{{"__instance__": "4"}},
}, },
}, },
interval: 150, interval: 150 * time.Millisecond,
}, },
}, },
"tp2": { "tp2": {
@ -498,7 +498,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "6"}}, Targets: []model.LabelSet{{"__instance__": "6"}},
}, },
}, },
interval: 200, interval: 200 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -511,7 +511,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "8"}}, Targets: []model.LabelSet{{"__instance__": "8"}},
}, },
}, },
interval: 100, interval: 100 * time.Millisecond,
}, },
}, },
}, },
@ -590,7 +590,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "2"}}, Targets: []model.LabelSet{{"__instance__": "2"}},
}, },
}, },
interval: 30, interval: 30 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -603,7 +603,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{}, Targets: []model.LabelSet{},
}, },
}, },
interval: 10, interval: 10 * time.Millisecond,
}, },
{ {
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
@ -616,7 +616,7 @@ func TestTargetUpdatesOrder(t *testing.T) {
Targets: []model.LabelSet{{"__instance__": "4"}}, Targets: []model.LabelSet{{"__instance__": "4"}},
}, },
}, },
interval: 300, interval: 300 * time.Millisecond,
}, },
}, },
}, },
@ -922,7 +922,7 @@ func TestCoordinationWithReceiver(t *testing.T) {
}, },
"mock1": newMockDiscoveryProvider( "mock1": newMockDiscoveryProvider(
update{ update{
interval: 2 * updateDelay / time.Millisecond, interval: 2 * updateDelay,
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
{ {
Source: "tg2", Source: "tg2",
@ -974,7 +974,7 @@ func TestCoordinationWithReceiver(t *testing.T) {
}, },
}, },
update{ update{
interval: 4 * updateDelay / time.Millisecond, interval: 4 * updateDelay,
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
{ {
Source: "tg2", Source: "tg2",
@ -1026,7 +1026,7 @@ func TestCoordinationWithReceiver(t *testing.T) {
}, },
}, },
update{ update{
interval: 2 * updateDelay / time.Millisecond, interval: 2 * updateDelay,
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
{ {
Source: "tg1", Source: "tg1",
@ -1113,7 +1113,7 @@ func TestCoordinationWithReceiver(t *testing.T) {
"mock2": newMockDiscoveryProvider( "mock2": newMockDiscoveryProvider(
// This update should only arrive after the receiver has read from the channel once. // This update should only arrive after the receiver has read from the channel once.
update{ update{
interval: 2 * updateDelay / time.Millisecond, interval: 2 * updateDelay,
targetGroups: []targetgroup.Group{ targetGroups: []targetgroup.Group{
{ {
Source: "tg2", Source: "tg2",
@ -1214,7 +1214,7 @@ func newMockDiscoveryProvider(updates ...update) mockdiscoveryProvider {
func (tp mockdiscoveryProvider) Run(ctx context.Context, upCh chan<- []*targetgroup.Group) { func (tp mockdiscoveryProvider) Run(ctx context.Context, upCh chan<- []*targetgroup.Group) {
for _, u := range tp.updates { for _, u := range tp.updates {
if u.interval > 0 { if u.interval > 0 {
t := time.NewTicker(u.interval * time.Millisecond) t := time.NewTicker(u.interval)
defer t.Stop() defer t.Stop()
Loop: Loop:
for { for {