mirror of
https://github.com/tailscale/tailscale.git
synced 2024-11-26 11:35:35 +00:00
7c386ca6d2
When splitting the radio monitor usage array, we were splitting at now % 3600 to get values into chronological order. This caused the value for the final second to be included at the beginning of the ordered slice rather than the end. If there was activity during that final second, an extra five seconds of high power usage would get recorded in some cases. This could result in a final calculation of greater than 100% usage. This corrects that by splitting values at (now+1 % 3600). This also simplifies the percentage calculation by always rounding values down, which is sufficient for our usage. Signed-off-by: Will Norris <will@tailscale.com>
82 lines
1.6 KiB
Go
82 lines
1.6 KiB
Go
// Copyright (c) Tailscale Inc & AUTHORS
|
|
// SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
//go:build tailscale_go && (darwin || ios || android || ts_enable_sockstats)
|
|
|
|
package sockstats
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
type testTime struct {
|
|
time.Time
|
|
}
|
|
|
|
func (t *testTime) now() time.Time {
|
|
return t.Time
|
|
}
|
|
|
|
func (t *testTime) Add(d time.Duration) {
|
|
t.Time = t.Time.Add(d)
|
|
}
|
|
|
|
func TestRadioMonitor(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
activity func(*testTime, *radioMonitor)
|
|
want int64
|
|
}{
|
|
{
|
|
"no activity",
|
|
func(_ *testTime, _ *radioMonitor) {},
|
|
0,
|
|
},
|
|
{
|
|
"active, 10 sec idle",
|
|
func(tt *testTime, rm *radioMonitor) {
|
|
rm.active()
|
|
tt.Add(10 * time.Second)
|
|
},
|
|
50, // radio on 5 seconds of 10 seconds
|
|
},
|
|
{
|
|
"400 iterations: 2 sec active, 1 min idle",
|
|
func(tt *testTime, rm *radioMonitor) {
|
|
// 400 iterations to ensure values loop back around rm.usage array
|
|
for i := 0; i < 400; i++ {
|
|
rm.active()
|
|
tt.Add(1 * time.Second)
|
|
rm.active()
|
|
tt.Add(59 * time.Second)
|
|
}
|
|
},
|
|
10, // radio on 6 seconds of every minute
|
|
},
|
|
{
|
|
"activity at end of time window",
|
|
func(tt *testTime, rm *radioMonitor) {
|
|
tt.Add(2 * time.Second)
|
|
rm.active()
|
|
},
|
|
50,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
tm := &testTime{time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC)}
|
|
rm := &radioMonitor{
|
|
startTime: tm.Time.Unix(),
|
|
now: tm.now,
|
|
}
|
|
tt.activity(tm, rm)
|
|
got := rm.radioHighPercent()
|
|
if got != tt.want {
|
|
t.Errorf("got radioOnPercent %d, want %d", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|