TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-08 23:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

tstest: prepare for Clock API changes

Browse Source 
This change introduces tstime.NewClock and tstime.ClockOpts as a new way
to construct tstime.Clock. This is a subset of #8464 as a stepping stone
so that we can update our internal code to use the new API before making
the second round of changes.

Updates #8463

Change-Id: Ib26edb60e5355802aeca83ed60e4fdf806c90e27
Signed-off-by: Adrian Dewhurst <adrian@tailscale.com>
This commit is contained in:
Adrian Dewhurst
2023-07-06 16:09:24 -04:00
committed by Adrian Dewhurst
parent fd8c8a3700
commit cd4c71c122
4 changed files with 95 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tsweb/tsweb_test.go
View File

@@ -65,10 +65,7 @@ func TestStdHandler(t *testing.T) {
testErr = errors.New("test error")
bgCtx = context.Background()
// canceledCtx, cancel = context.WithCancel(bgCtx)
clock = tstest.Clock{
Start: time.Now(),
Step: time.Second,
}
startTime = time.Unix(1687870000, 1234)
)
// cancel()
@@ -86,7 +83,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/"),
wantCode: 200,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
TLS: false,
@@ -103,7 +100,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 404,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -119,7 +116,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 404,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -136,7 +133,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 404,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -153,7 +150,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 500,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -170,7 +167,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 500,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -187,7 +184,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 500,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -204,7 +201,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 200,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -221,7 +218,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 200,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -238,7 +235,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 200,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
Host: "example.com",
@@ -260,7 +257,7 @@ func TestStdHandler(t *testing.T) {
r: req(bgCtx, "http://example.com/foo"),
wantCode: 200,
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
@@ -279,7 +276,7 @@ func TestStdHandler(t *testing.T) {
http.Error(w, e.Msg, 200)
},
wantLog: AccessLogRecord{
When: clock.Start,
When: startTime,
Seconds: 1.0,
Proto: "HTTP/1.1",
TLS: false,
@@ -302,7 +299,10 @@ func TestStdHandler(t *testing.T) {
t.Logf(fmt, args...)
}
clock.Reset()
clock := tstest.NewClock(tstest.ClockOpts{
Start: startTime,
Step: time.Second,
})
rec := noopHijacker{httptest.NewRecorder(), false}
h := StdHandler(test.rh, HandlerOptions{Logf: logf, Now: clock.Now, OnError: test.errHandler})