@@ -10,7 +10,6 @@ import (
10
10
"errors"
11
11
"fmt"
12
12
"io"
13
- "io/ioutil"
14
13
"math"
15
14
"math/rand"
16
15
"net"
@@ -1291,7 +1290,9 @@ func testCodecRpcOne(t *testing.T, rr Rpc, h Handle, doRequest bool, exitSleepMs
1291
1290
defer func () { jsonH .TermWhitespace = false }()
1292
1291
}
1293
1292
srv := rpc .NewServer ()
1294
- srv .Register (testRpcInt )
1293
+ if err := srv .Register (testRpcInt ); err != nil {
1294
+ t .Fatal (err )
1295
+ }
1295
1296
ln , err := net .Listen ("tcp" , "127.0.0.1:0" ) // listen on ipv4 localhost
1296
1297
logT (t , "connFn: addr: %v, network: %v, port: %v" , ln .Addr (), ln .Addr ().Network (), (ln .Addr ().(* net.TCPAddr )).Port )
1297
1298
// log("listener: %v", ln.Addr())
@@ -1673,7 +1674,7 @@ func doTestRawValue(t *testing.T, name string, h Handle) {
1673
1674
func doTestPythonGenStreams (t * testing.T , name string , h Handle ) {
1674
1675
testOnce .Do (testInitAll )
1675
1676
logT (t , "TestPythonGenStreams-%v" , name )
1676
- tmpdir , err := ioutil . TempDir ("" , "golang-" + name + "-test" )
1677
+ tmpdir , err := os . MkdirTemp ("" , "golang-" + name + "-test" )
1677
1678
if err != nil {
1678
1679
logT (t , "-------- Unable to create temp directory\n " )
1679
1680
failT (t )
@@ -1707,7 +1708,7 @@ func doTestPythonGenStreams(t *testing.T, name string, h Handle) {
1707
1708
logT (t , ".............................................." )
1708
1709
logT (t , " Testing: #%d: %T, %#v\n " , i , v , v )
1709
1710
var bss []byte
1710
- bss , err = ioutil .ReadFile (filepath .Join (tmpdir , strconv .Itoa (i )+ "." + name + ".golden" ))
1711
+ bss , err = os .ReadFile (filepath .Join (tmpdir , strconv .Itoa (i )+ "." + name + ".golden" ))
1711
1712
if err != nil {
1712
1713
logT (t , "-------- Error reading golden file: %d. Err: %v" , i , err )
1713
1714
failT (t )
@@ -1795,7 +1796,9 @@ func doTestMsgpackRpcSpecGoClientToPythonSvc(t *testing.T) {
1795
1796
var mArgs MsgpackSpecRpcMultiArgs = []interface {}{"A1" , "B2" , "C3" }
1796
1797
checkErrT (t , cl .Call ("Echo123" , mArgs , & rstr ))
1797
1798
checkEqualT (t , rstr , "1:A1 2:B2 3:C3" , "rstr=" )
1798
- cmd .Process .Kill ()
1799
+ if err := cmd .Process .Kill (); err != nil {
1800
+ t .Fatal (err )
1801
+ }
1799
1802
}
1800
1803
1801
1804
func doTestMsgpackRpcSpecPythonClientToGoSvc (t * testing.T ) {
@@ -2083,7 +2086,7 @@ func doTestLargeContainerLen(t *testing.T, h Handle) {
2083
2086
func testRandomFillRV (v reflect.Value ) {
2084
2087
testOnce .Do (testInitAll )
2085
2088
fneg := func () int64 {
2086
- i := rand .Intn (1 )
2089
+ i := rand .Intn (2 )
2087
2090
if i == 1 {
2088
2091
return 1
2089
2092
}
@@ -2394,7 +2397,11 @@ func doTestScalars(t *testing.T, name string, h Handle) {
2394
2397
func doTestIntfMapping (t * testing.T , name string , h Handle ) {
2395
2398
testOnce .Do (testInitAll )
2396
2399
rti := reflect .TypeOf ((* testIntfMapI )(nil )).Elem ()
2397
- defer func () { basicHandle (h ).Intf2Impl (rti , nil ) }()
2400
+ defer func () {
2401
+ if err := basicHandle (h ).Intf2Impl (rti , nil ); err != nil {
2402
+ t .Fatal (err )
2403
+ }
2404
+ }()
2398
2405
2399
2406
type T9 struct {
2400
2407
I testIntfMapI
@@ -2705,7 +2712,7 @@ func TestBufioDecReader(t *testing.T) {
2705
2712
var r = strings .NewReader (s )
2706
2713
var br = & bufioDecReader {buf : make ([]byte , 0 , 13 )}
2707
2714
br .r = r
2708
- b , err := ioutil .ReadAll (br .r )
2715
+ b , err := io .ReadAll (br .r )
2709
2716
if err != nil {
2710
2717
panic (err )
2711
2718
}
0 commit comments