commit 908cf3fc6413930dacdf8a29b5834a5dcf5eab92
Author: Cecylia Bocovich <[email protected]>
Date: Tue Jun 25 10:06:00 2019 -0400
Updated tests to check new stats
Updated the tests to pass with our new snowflake-ips-total stat
---
broker/snowflake-broker_test.go | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go
index bbbad3d..5afbe33 100644
--- a/broker/snowflake-broker_test.go
+++ b/broker/snowflake-broker_test.go
@@ -419,7 +419,7 @@ func TestMetrics(t *testing.T) {
<-done
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
CA=1\nsnowflake-idle-count 8\nclient-denied-count
0\nclient-snowflake-match-count 0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
CA=1\nsnowflake-ips-total 1\nsnowflake-idle-count 8\nclient-denied-count
0\nclient-snowflake-match-count 0\n")
})
//Test addition of client failures
@@ -432,13 +432,13 @@ func TestMetrics(t *testing.T) {
clientOffers(ctx, w, r)
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count
0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count
8\nclient-snowflake-match-count 0\n")
// Test reset
buf.Reset()
ctx.metrics.zeroMetrics()
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count
0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count
0\nclient-snowflake-match-count 0\n")
})
//Test addition of client matches
Convey("for client-proxy match", func() {
@@ -459,7 +459,7 @@ func TestMetrics(t *testing.T) {
<-done
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-idle-count 0\nclient-denied-count 0\nclient-snowflake-match-count
8\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count
0\nclient-snowflake-match-count 8\n")
})
//Test rounding boundary
Convey("binning boundary", func() {
@@ -478,12 +478,12 @@ func TestMetrics(t *testing.T) {
clientOffers(ctx, w, r)
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-idle-count 0\nclient-denied-count 8\nclient-snowflake-match-count
0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count
8\nclient-snowflake-match-count 0\n")
clientOffers(ctx, w, r)
buf.Reset()
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-idle-count 0\nclient-denied-count 16\nclient-snowflake-match-count
0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
\nsnowflake-ips-total 0\nsnowflake-idle-count 0\nclient-denied-count
16\nclient-snowflake-match-count 0\n")
})
//Test unique ip
@@ -515,7 +515,7 @@ func TestMetrics(t *testing.T) {
<-done
ctx.metrics.printMetrics()
- So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
CA=1\nsnowflake-idle-count 8\nclient-denied-count
0\nclient-snowflake-match-count 0\n")
+ So(buf.String(), ShouldResemble, "snowflake-stats-end
"+time.Now().UTC().Format("2006-01-02 15:04:05")+" (86400 s)\nsnowflake-ips
CA=1\nsnowflake-ips-total 1\nsnowflake-idle-count 8\nclient-denied-count
0\nclient-snowflake-match-count 0\n")
})
})
}
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
