You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/09/10 19:46:15 UTC
[trafficcontrol] 02/02: Fix Grove test stats
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 2d6782383d2d957a9d9928543ca37d84cb0fe81d
Author: Robert Butts <ro...@apache.org>
AuthorDate: Mon Sep 10 12:08:55 2018 -0600
Fix Grove test stats
---
grove/stat/stats_test.go | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/grove/stat/stats_test.go b/grove/stat/stats_test.go
index 9f17d58..5d24f68 100644
--- a/grove/stat/stats_test.go
+++ b/grove/stat/stats_test.go
@@ -20,7 +20,7 @@ import (
"testing"
"time"
- "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/remapdata"
"github.com/apache/trafficcontrol/grove/web"
)
@@ -83,8 +83,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
expected := 10
StatsInc(httpConns, expected, &addrs)
if actual := stats.Connections(); actual != uint64(expected) {
@@ -95,8 +95,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
expected := 10
StatsInc(httpsConns, expected, &addrs)
if actual := stats.Connections(); actual != uint64(expected) {
@@ -107,8 +107,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
expected := 10
StatsInc(httpConns, expected, &addrs)
StatsInc(httpsConns, expected, &addrs)
@@ -121,8 +121,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
count := 10
StatsInc(httpConns, count, &addrs)
StatsDec(httpConns, count, &addrs)
@@ -134,8 +134,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
count := 10
StatsInc(httpsConns, count, &addrs)
StatsDec(httpsConns, count, &addrs)
@@ -147,8 +147,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
count := 10
StatsInc(httpConns, count, &addrs)
StatsInc(httpsConns, count, &addrs)
@@ -162,8 +162,8 @@ func TestStatsCount(t *testing.T) {
httpConns := web.NewConnMap()
httpsConns := web.NewConnMap()
addrs := []string{}
- r := remap.RemapRule{RemapRuleBase: remap.RemapRuleBase{Name: "foo"}}
- stats := New([]remap.RemapRule{r}, nil, 0, httpConns, httpsConns)
+ r := remapdata.RemapRule{RemapRuleBase: remapdata.RemapRuleBase{Name: "foo"}}
+ stats := New([]remapdata.RemapRule{r}, nil, 0, httpConns, httpsConns, "fakeversion")
count := 10
StatsInc(httpConns, count, &addrs)
StatsDec(httpConns, 1, &addrs)