archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

all: do not depend on the testing package

Browse Source 
Discovered while looking for something else.

Updates tailscale/corp#18935

Signed-off-by: Maisem Ali <maisem@tailscale.com>
clairew/handle-auto-exit-node-value
Maisem Ali 6 months ago committed by Brad Fitzpatrick
parent 4214e5f71b
commit 9a64c06a20
12 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
client/tailscale/localclient_test.go
Unescape Escape View File

@ -35,6 +35,7 @@ func TestDeps(t *testing.T) {
BadDeps: map[string]string{ BadDeps: map[string]string{
// Make sure we don't again accidentally bring in a dependency on // Make sure we don't again accidentally bring in a dependency on
// drive or its transitive dependencies // drive or its transitive dependencies
"testing": "do not use testing package in production code",
"tailscale.com/drive/driveimpl": "https://github.com/tailscale/tailscale/pull/10631", "tailscale.com/drive/driveimpl": "https://github.com/tailscale/tailscale/pull/10631",
"github.com/studio-b12/gowebdav": "https://github.com/tailscale/tailscale/pull/10631", "github.com/studio-b12/gowebdav": "https://github.com/tailscale/tailscale/pull/10631",
}, },

5
cmd/derper/depaware.txt
Unescape Escape View File

@ -235,7 +235,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
encoding/pem from crypto/tls+ encoding/pem from crypto/tls+
errors from bufio+ errors from bufio+
expvar from github.com/prometheus/client_golang/prometheus+ expvar from github.com/prometheus/client_golang/prometheus+
flag from tailscale.com/cmd/derper+ flag from tailscale.com/cmd/derper
fmt from compress/flate+ fmt from compress/flate+
go/token from google.golang.org/protobuf/internal/strs go/token from google.golang.org/protobuf/internal/strs
hash from crypto+ hash from crypto+
@ -277,7 +277,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
runtime/debug from github.com/prometheus/client_golang/prometheus+ runtime/debug from github.com/prometheus/client_golang/prometheus+
runtime/metrics from github.com/prometheus/client_golang/prometheus+ runtime/metrics from github.com/prometheus/client_golang/prometheus+
runtime/pprof from net/http/pprof runtime/pprof from net/http/pprof
runtime/trace from net/http/pprof+ runtime/trace from net/http/pprof
slices from tailscale.com/ipn/ipnstate+ slices from tailscale.com/ipn/ipnstate+
sort from compress/flate+ sort from compress/flate+
strconv from compress/flate+ strconv from compress/flate+
@ -285,7 +285,6 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
sync from compress/flate+ sync from compress/flate+
sync/atomic from context+ sync/atomic from context+
syscall from crypto/rand+ syscall from crypto/rand+
testing from tailscale.com/util/syspolicy
text/tabwriter from runtime/pprof text/tabwriter from runtime/pprof
time from compress/gzip+ time from compress/gzip+
unicode from bytes+ unicode from bytes+

1
cmd/derper/derper_test.go
Unescape Escape View File

@ -99,6 +99,7 @@ func TestNoContent(t *testing.T) {
func TestDeps(t *testing.T) { func TestDeps(t *testing.T) {
deptest.DepChecker{ deptest.DepChecker{
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756",

2
cmd/tailscale/depaware.txt
Unescape Escape View File

@ -299,7 +299,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
regexp from github.com/coreos/go-iptables/iptables+ regexp from github.com/coreos/go-iptables/iptables+
regexp/syntax from regexp regexp/syntax from regexp
runtime/debug from nhooyr.io/websocket/internal/xsync+ runtime/debug from nhooyr.io/websocket/internal/xsync+
runtime/trace from testing
slices from tailscale.com/client/web+ slices from tailscale.com/client/web+
sort from archive/tar+ sort from archive/tar+
strconv from archive/tar+ strconv from archive/tar+
@ -307,7 +306,6 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep
sync from archive/tar+ sync from archive/tar+
sync/atomic from context+ sync/atomic from context+
syscall from archive/tar+ syscall from archive/tar+
testing from tailscale.com/util/syspolicy
text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+ text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+
text/template from html/template text/template from html/template
text/template/parse from html/template+ text/template/parse from html/template+

1
cmd/tailscale/tailscale_test.go
Unescape Escape View File

@ -12,6 +12,7 @@ import (
func TestDeps(t *testing.T) { func TestDeps(t *testing.T) {
deptest.DepChecker{ deptest.DepChecker{
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756",

3
cmd/tailscaled/depaware.txt
Unescape Escape View File

@ -553,7 +553,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
regexp/syntax from regexp regexp/syntax from regexp
runtime/debug from github.com/aws/aws-sdk-go-v2/internal/sync/singleflight+ runtime/debug from github.com/aws/aws-sdk-go-v2/internal/sync/singleflight+
runtime/pprof from net/http/pprof+ runtime/pprof from net/http/pprof+
runtime/trace from net/http/pprof+ runtime/trace from net/http/pprof
slices from tailscale.com/appc+ slices from tailscale.com/appc+
sort from archive/tar+ sort from archive/tar+
strconv from archive/tar+ strconv from archive/tar+
@ -561,7 +561,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
sync from archive/tar+ sync from archive/tar+
sync/atomic from context+ sync/atomic from context+
syscall from archive/tar+ syscall from archive/tar+
testing from tailscale.com/util/syspolicy
text/tabwriter from runtime/pprof text/tabwriter from runtime/pprof
text/template from html/template text/template from html/template
text/template/parse from html/template+ text/template/parse from html/template+

2
cmd/tailscaled/tailscaled_test.go
Unescape Escape View File

@ -20,6 +20,7 @@ func TestDeps(t *testing.T) {
GOOS: "darwin", GOOS: "darwin",
GOARCH: "arm64", GOARCH: "arm64",
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"gvisor.dev/gvisor/pkg/hostarch": "will crash on non-4K page sizes; see https://github.com/tailscale/tailscale/issues/8658", "gvisor.dev/gvisor/pkg/hostarch": "will crash on non-4K page sizes; see https://github.com/tailscale/tailscale/issues/8658",
}, },
}.Check(t) }.Check(t)
@ -28,6 +29,7 @@ func TestDeps(t *testing.T) {
GOOS: "linux", GOOS: "linux",
GOARCH: "arm64", GOARCH: "arm64",
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"gvisor.dev/gvisor/pkg/hostarch": "will crash on non-4K page sizes; see https://github.com/tailscale/tailscale/issues/8658", "gvisor.dev/gvisor/pkg/hostarch": "will crash on non-4K page sizes; see https://github.com/tailscale/tailscale/issues/8658",
}, },
}.Check(t) }.Check(t)

1
ipn/ipn_test.go
Unescape Escape View File

@ -12,6 +12,7 @@ import (
func TestDeps(t *testing.T) { func TestDeps(t *testing.T) {
deptest.DepChecker{ deptest.DepChecker{
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/buffer": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/cpuid": "https://github.com/tailscale/tailscale/issues/9756",
"gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756", "gvisor.dev/gvisor/pkg/tcpip": "https://github.com/tailscale/tailscale/issues/9756",

1
tailcfg/tailcfg_test.go
Unescape Escape View File

@ -859,6 +859,7 @@ func TestDeps(t *testing.T) {
BadDeps: map[string]string{ BadDeps: map[string]string{
// Make sure we don't again accidentally bring in a dependency on // Make sure we don't again accidentally bring in a dependency on
// drive or its transitive dependencies // drive or its transitive dependencies
"testing": "do not use testing package in production code",
"tailscale.com/drive/driveimpl": "https://github.com/tailscale/tailscale/pull/10631", "tailscale.com/drive/driveimpl": "https://github.com/tailscale/tailscale/pull/10631",
"github.com/studio-b12/gowebdav": "https://github.com/tailscale/tailscale/pull/10631", "github.com/studio-b12/gowebdav": "https://github.com/tailscale/tailscale/pull/10631",
}, },

1
tstest/iosdeps/iosdeps_test.go
Unescape Escape View File

@ -14,6 +14,7 @@ func TestDeps(t *testing.T) {
GOOS: "ios", GOOS: "ios",
GOARCH: "arm64", GOARCH: "arm64",
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"text/template": "linker bloat (MethodByName)", "text/template": "linker bloat (MethodByName)",
"html/template": "linker bloat (MethodByName)", "html/template": "linker bloat (MethodByName)",
}, },

1
tstest/jsdeps/jsdeps_test.go
Unescape Escape View File

@ -14,6 +14,7 @@ func TestDeps(t *testing.T) {
GOOS: "js", GOOS: "js",
GOARCH: "wasm", GOARCH: "wasm",
BadDeps: map[string]string{ BadDeps: map[string]string{
"testing": "do not use testing package in production code",
"runtime/pprof": "bloat", "runtime/pprof": "bloat",
"golang.org/x/net/http2/h2c": "bloat", "golang.org/x/net/http2/h2c": "bloat",
"net/http/pprof": "bloat", "net/http/pprof": "bloat",

10
util/syspolicy/handler.go
Unescape Escape View File

@ -6,7 +6,6 @@ package syspolicy
import ( import (
"errors" "errors"
"sync/atomic" "sync/atomic"
"testing"
) )
var ( var (
@ -69,7 +68,14 @@ func RegisterHandler(h Handler) {
} }
} }
func SetHandlerForTest(tb testing.TB, h Handler) { // TB is a subset of testing.TB that we use to set up test helpers.
// It's defined here to avoid pulling in the testing package.
type TB interface {
Helper()
Cleanup(func())
}
func SetHandlerForTest(tb TB, h Handler) {
tb.Helper() tb.Helper()
oldHandler := handler oldHandler := handler
handler = h handler = h

Write Preview
Loading…
Cancel
Save