mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

"Fix" testing of ratelimiting code.

This commit is contained in:
Alex Bramley 2012-02-04 01:32:48 +00:00
parent eb87e56f96
commit 6fd04236fb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/connection_test.go
View File

@ -342,8 +342,8 @@ func TestWrite(t *testing.T) {
s.nc.Expect("yo momma") s.nc.Expect("yo momma")
// Flood control is disabled -- setUp sets c.Flood = true -- so we should // Flood control is disabled -- setUp sets c.Flood = true -- so we should
// not have set c.badness or c.lastsent at this point. // not have set c.badness at this point.
if c.badness != 0 || c.lastsent != 0 { if c.badness != 0 {
t.Errorf("Flood control used when Flood = true.") t.Errorf("Flood control used when Flood = true.")
} }
@ -351,8 +351,8 @@ func TestWrite(t *testing.T) {
c.write("she so useless") c.write("she so useless")
s.nc.Expect("she so useless") s.nc.Expect("she so useless")
// The lastsent time should have been updated now. // The lastsent time should have been updated very recently...
if c.lastsent == 0 { if time.Now().Sub(c.lastsent) > time.Millisecond {
t.Errorf("Flood control not used when Flood = false.") t.Errorf("Flood control not used when Flood = false.")
} }
@ -378,12 +378,11 @@ func TestRateLimit(t *testing.T) {
c, s := setUp(t) c, s := setUp(t)
defer s.tearDown() defer s.tearDown()
if c.badness != 0 || c.lastsent != 0 { if c.badness != 0 {
t.Errorf("Bad initial values for rate limit variables.") t.Errorf("Bad initial values for rate limit variables.")
} }
// badness will still be 0 because lastsent was 0 before rateLimit. if l := c.rateLimit(60); l != 0 || c.badness == 0 {
if l := c.rateLimit(60); l != 0 || c.badness != 0 || c.lastsent == 0 {
t.Errorf("Rate limit variables not updated correctly after rateLimit.") t.Errorf("Rate limit variables not updated correctly after rateLimit.")
} }
// So, time at the nanosecond resolution is a bit of a bitch. Choosing 60 // So, time at the nanosecond resolution is a bit of a bitch. Choosing 60
@ -391,11 +390,12 @@ func TestRateLimit(t *testing.T) {
// 2.5 seconds minus the delta between the two ratelimit calls. This should // 2.5 seconds minus the delta between the two ratelimit calls. This should
// be minimal but it's guaranteed that it won't be zero. Use 1us as a fuzz. // be minimal but it's guaranteed that it won't be zero. Use 1us as a fuzz.
// This seems to be the minimum timer resolution, on my laptop at least... // This seems to be the minimum timer resolution, on my laptop at least...
if l := c.rateLimit(60); l != 0 || c.badness - int64(25*1e8) > 1e3 { if l := c.rateLimit(60); l != 0 || c.badness - 25*1e8 > time.Microsecond {
t.Errorf("Rate limit calculating badness incorrectly.") t.Errorf("Rate limit calculating badness incorrectly.")
} }
// At this point, we can tip over the badness scale, with a bit of help. // At this point, we can tip over the badness scale, with a bit of help.
if l := c.rateLimit(360); l == 80*1e8 || c.badness - int64(105*1e8) > 1e3 { if l := c.rateLimit(360); l == 80*1e8 ||
c.badness - 105*1e8 > time.Microsecond {
t.Errorf("Rate limit failed to return correct limiting values.") t.Errorf("Rate limit failed to return correct limiting values.")
} }
} }