release 3.9.0 process: reduce warnings (#279)
* fix(riseupvpn): address gofmt warning Thanks to https://goreportcard.com/report/github.com/ooni/probe-cli. * fix(utils.go): correct the docu-comment Thanks to https://goreportcard.com/report/github.com/ooni/probe-cli * fix: improve spelling Thanks to https://goreportcard.com/report/github.com/ooni/probe-cli * fix(modelx_test.go): avoid inefassign warning Thanks to https://goreportcard.com/report/github.com/ooni/probe-cli * fix: reduce number of ineffective assignments Thanks to https://goreportcard.com/report/github.com/ooni/probe-cli
This commit is contained in:
parent
5c47a87af7
commit
bd451016f5
|
@ -39,7 +39,7 @@ func EscapeAwareRuneCountInString(s string) int {
|
||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
// RightPadd adds right padding in from of a string
|
// RightPad adds right padding in from of a string
|
||||||
func RightPad(str string, length int) string {
|
func RightPad(str string, length int) string {
|
||||||
c := length - EscapeAwareRuneCountInString(str)
|
c := length - EscapeAwareRuneCountInString(str)
|
||||||
if c < 0 {
|
if c < 0 {
|
||||||
|
|
|
@ -555,6 +555,9 @@ func TestMissingTransport(t *testing.T) {
|
||||||
transports = transports[:len(transports)-1]
|
transports = transports[:len(transports)-1]
|
||||||
eipService.Gateways[1].Capabilities.Transport = transports
|
eipService.Gateways[1].Capabilities.Transport = transports
|
||||||
eipservicejson, err := json.Marshal(eipservice)
|
eipservicejson, err := json.Marshal(eipservice)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
requestResponseMap := map[string]string{
|
requestResponseMap := map[string]string{
|
||||||
eipserviceurl: string(eipservicejson),
|
eipserviceurl: string(eipservicejson),
|
||||||
|
@ -746,7 +749,7 @@ func generateMockGetter(requestResponse map[string]string, responseStatus map[st
|
||||||
FailedOperation: failedOperation,
|
FailedOperation: failedOperation,
|
||||||
HTTPResponseStatus: responseStatus,
|
HTTPResponseStatus: responseStatus,
|
||||||
HTTPResponseBody: responseBody,
|
HTTPResponseBody: responseBody,
|
||||||
Requests: []archival.RequestEntry{archival.RequestEntry{
|
Requests: []archival.RequestEntry{{
|
||||||
Failure: failure,
|
Failure: failure,
|
||||||
Request: archival.HTTPRequest{
|
Request: archival.HTTPRequest{
|
||||||
URL: url,
|
URL: url,
|
||||||
|
|
|
@ -29,7 +29,6 @@ func SNISplitter(input []byte, sni []byte) (output [][]byte) {
|
||||||
}
|
}
|
||||||
if len(buf) > 0 {
|
if len(buf) > 0 {
|
||||||
output = append(output, buf)
|
output = append(output, buf)
|
||||||
buf = nil
|
|
||||||
}
|
}
|
||||||
output = append(output, input[idx+len(sni):])
|
output = append(output, input[idx+len(sni):])
|
||||||
return
|
return
|
||||||
|
|
|
@ -159,7 +159,7 @@ func (il *InputLoader) loadLocal() ([]model.URLInfo, error) {
|
||||||
type inputLoaderOpenFn func(filepath string) (fs.File, error)
|
type inputLoaderOpenFn func(filepath string) (fs.File, error)
|
||||||
|
|
||||||
// readfile reads inputs from the specified file. The open argument should be
|
// readfile reads inputs from the specified file. The open argument should be
|
||||||
// compatibile with stdlib's fs.Open and helps us with unit testing.
|
// compatible with stdlib's fs.Open and helps us with unit testing.
|
||||||
func (il *InputLoader) readfile(filepath string, open inputLoaderOpenFn) ([]model.URLInfo, error) {
|
func (il *InputLoader) readfile(filepath string, open inputLoaderOpenFn) ([]model.URLInfo, error) {
|
||||||
inputs := []model.URLInfo{}
|
inputs := []model.URLInfo{}
|
||||||
filep, err := open(filepath)
|
filep, err := open(filepath)
|
||||||
|
|
|
@ -101,6 +101,9 @@ func TestDialerSetCABundleWAI(t *testing.T) {
|
||||||
func TestDialerForceSpecificSNI(t *testing.T) {
|
func TestDialerForceSpecificSNI(t *testing.T) {
|
||||||
dialer := netx.NewDialer()
|
dialer := netx.NewDialer()
|
||||||
err := dialer.ForceSpecificSNI("www.facebook.com")
|
err := dialer.ForceSpecificSNI("www.facebook.com")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
conn, err := dialer.DialTLS("tcp", "www.google.com:443")
|
conn, err := dialer.DialTLS("tcp", "www.google.com:443")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("expected an error here")
|
t.Fatal("expected an error here")
|
||||||
|
|
|
@ -56,7 +56,7 @@ func TestMeasurementRootWithMeasurementRootPanic(t *testing.T) {
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
ctx = WithMeasurementRoot(ctx, nil)
|
_ = WithMeasurementRoot(ctx, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestErrWrapperPublicAPI(t *testing.T) {
|
func TestErrWrapperPublicAPI(t *testing.T) {
|
||||||
|
|
|
@ -175,6 +175,9 @@ func TestToFailureString(t *testing.T) {
|
||||||
defer cancel() // fail immediately
|
defer cancel() // fail immediately
|
||||||
udpAddr := &net.UDPAddr{IP: net.ParseIP("216.58.212.164"), Port: 80, Zone: ""}
|
udpAddr := &net.UDPAddr{IP: net.ParseIP("216.58.212.164"), Port: 80, Zone: ""}
|
||||||
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
|
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
sess, err := quic.DialEarlyContext(ctx, udpConn, udpAddr, "google.com:80", &tls.Config{}, &quic.Config{})
|
sess, err := quic.DialEarlyContext(ctx, udpConn, udpAddr, "google.com:80", &tls.Config{}, &quic.Config{})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("expected an error here")
|
t.Fatal("expected an error here")
|
||||||
|
|
|
@ -78,7 +78,7 @@ func TestMaybeUpdateResourcesWithCancelledContext(t *testing.T) {
|
||||||
ctx := sess.NewContext()
|
ctx := sess.NewContext()
|
||||||
ctx.Cancel() // cause immediate failure
|
ctx.Cancel() // cause immediate failure
|
||||||
err = sess.MaybeUpdateResources(ctx)
|
err = sess.MaybeUpdateResources(ctx)
|
||||||
// Explaination: we embed resources. We should change the API
|
// Explanation: we embed resources. We should change the API
|
||||||
// and remove the context. Until we do that, let us just assert
|
// and remove the context. Until we do that, let us just assert
|
||||||
// that we have embedding and the context does not matter.
|
// that we have embedding and the context does not matter.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user