mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-11 04:52:08 +00:00
Merge pull request #117900 from skitt/ioutil-apimachinery-util
apimachinery/util: stop using deprecated io/ioutil
This commit is contained in:
commit
5d524f3dc3
@ -19,7 +19,6 @@ package framer
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -34,7 +33,7 @@ func TestRead(t *testing.T) {
|
|||||||
0x08,
|
0x08,
|
||||||
}
|
}
|
||||||
b := bytes.NewBuffer(data)
|
b := bytes.NewBuffer(data)
|
||||||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b))
|
r := NewLengthDelimitedFrameReader(io.NopCloser(b))
|
||||||
buf := make([]byte, 1)
|
buf := make([]byte, 1)
|
||||||
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) {
|
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) {
|
||||||
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
||||||
@ -79,7 +78,7 @@ func TestReadLarge(t *testing.T) {
|
|||||||
0x08,
|
0x08,
|
||||||
}
|
}
|
||||||
b := bytes.NewBuffer(data)
|
b := bytes.NewBuffer(data)
|
||||||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b))
|
r := NewLengthDelimitedFrameReader(io.NopCloser(b))
|
||||||
buf := make([]byte, 40)
|
buf := make([]byte, 40)
|
||||||
if n, err := r.Read(buf); err != nil && n != 4 && bytes.Equal(buf, []byte{0x01, 0x02, 0x03, 0x04}) {
|
if n, err := r.Read(buf); err != nil && n != 4 && bytes.Equal(buf, []byte{0x01, 0x02, 0x03, 0x04}) {
|
||||||
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
||||||
@ -104,7 +103,7 @@ func TestReadInvalidFrame(t *testing.T) {
|
|||||||
0x01, 0x02,
|
0x01, 0x02,
|
||||||
}
|
}
|
||||||
b := bytes.NewBuffer(data)
|
b := bytes.NewBuffer(data)
|
||||||
r := NewLengthDelimitedFrameReader(ioutil.NopCloser(b))
|
r := NewLengthDelimitedFrameReader(io.NopCloser(b))
|
||||||
buf := make([]byte, 1)
|
buf := make([]byte, 1)
|
||||||
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) {
|
if n, err := r.Read(buf); err != io.ErrShortBuffer && n != 1 && bytes.Equal(buf, []byte{0x01}) {
|
||||||
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
t.Fatalf("unexpected: %v %d %v", err, n, buf)
|
||||||
@ -122,7 +121,7 @@ func TestReadInvalidFrame(t *testing.T) {
|
|||||||
|
|
||||||
func TestJSONFrameReader(t *testing.T) {
|
func TestJSONFrameReader(t *testing.T) {
|
||||||
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]")
|
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]")
|
||||||
r := NewJSONFramedReader(ioutil.NopCloser(b))
|
r := NewJSONFramedReader(io.NopCloser(b))
|
||||||
buf := make([]byte, 20)
|
buf := make([]byte, 20)
|
||||||
if n, err := r.Read(buf); err != nil || n != 13 || string(buf[:n]) != `{"test":true}` {
|
if n, err := r.Read(buf); err != nil || n != 13 || string(buf[:n]) != `{"test":true}` {
|
||||||
t.Fatalf("unexpected: %v %d %q", err, n, buf)
|
t.Fatalf("unexpected: %v %d %q", err, n, buf)
|
||||||
@ -140,7 +139,7 @@ func TestJSONFrameReader(t *testing.T) {
|
|||||||
|
|
||||||
func TestJSONFrameReaderShortBuffer(t *testing.T) {
|
func TestJSONFrameReaderShortBuffer(t *testing.T) {
|
||||||
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]")
|
b := bytes.NewBufferString("{\"test\":true}\n1\n[\"a\"]")
|
||||||
r := NewJSONFramedReader(ioutil.NopCloser(b))
|
r := NewJSONFramedReader(io.NopCloser(b))
|
||||||
buf := make([]byte, 3)
|
buf := make([]byte, 3)
|
||||||
|
|
||||||
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `{"t` {
|
if n, err := r.Read(buf); err != io.ErrShortBuffer || n != 3 || string(buf[:n]) != `{"t` {
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httputil"
|
"net/http/httputil"
|
||||||
@ -337,7 +337,7 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
|
|||||||
if (resp.StatusCode != http.StatusSwitchingProtocols) || !strings.Contains(connectionHeader, strings.ToLower(httpstream.HeaderUpgrade)) || !strings.Contains(upgradeHeader, strings.ToLower(HeaderSpdy31)) {
|
if (resp.StatusCode != http.StatusSwitchingProtocols) || !strings.Contains(connectionHeader, strings.ToLower(httpstream.HeaderUpgrade)) || !strings.Contains(upgradeHeader, strings.ToLower(HeaderSpdy31)) {
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
responseError := ""
|
responseError := ""
|
||||||
responseErrorBytes, err := ioutil.ReadAll(resp.Body)
|
responseErrorBytes, err := io.ReadAll(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
responseError = "unable to read error from server response"
|
responseError = "unable to read error from server response"
|
||||||
} else {
|
} else {
|
||||||
|
@ -19,8 +19,8 @@ package managedfields_test
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
@ -42,7 +42,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var fakeTypeConverter = func() managedfields.TypeConverter {
|
var fakeTypeConverter = func() managedfields.TypeConverter {
|
||||||
data, err := ioutil.ReadFile(filepath.Join(strings.Repeat(".."+string(filepath.Separator), 7),
|
data, err := os.ReadFile(filepath.Join(strings.Repeat(".."+string(filepath.Separator), 7),
|
||||||
"api", "openapi-spec", "swagger.json"))
|
"api", "openapi-spec", "swagger.json"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -264,7 +264,7 @@ func TestApplyDoesNotStripLabels(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func getObjectBytes(file string) []byte {
|
func getObjectBytes(file string) []byte {
|
||||||
s, err := ioutil.ReadFile(file)
|
s, err := os.ReadFile(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ package internal_test
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var fakeTypeConverter = func() internal.TypeConverter {
|
var fakeTypeConverter = func() internal.TypeConverter {
|
||||||
data, err := ioutil.ReadFile(filepath.Join(
|
data, err := os.ReadFile(filepath.Join(
|
||||||
strings.Repeat(".."+string(filepath.Separator), 8),
|
strings.Repeat(".."+string(filepath.Separator), 8),
|
||||||
"api", "openapi-spec", "swagger.json"))
|
"api", "openapi-spec", "swagger.json"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -19,7 +19,7 @@ package internal
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
@ -32,7 +32,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var testTypeConverter = func() TypeConverter {
|
var testTypeConverter = func() TypeConverter {
|
||||||
data, err := ioutil.ReadFile(filepath.Join("testdata", "swagger.json"))
|
data, err := os.ReadFile(filepath.Join("testdata", "swagger.json"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,6 @@ package net
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
@ -700,7 +699,7 @@ func TestGetIPFromHostInterfaces(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func makeRouteFile(content string, t *testing.T) (*os.File, error) {
|
func makeRouteFile(content string, t *testing.T) (*os.File, error) {
|
||||||
routeFile, err := ioutil.TempFile("", "route")
|
routeFile, err := os.CreateTemp("", "route")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"path"
|
"path"
|
||||||
@ -263,7 +262,7 @@ func (t *Transport) rewriteResponse(req *http.Request, resp *http.Response) (*ht
|
|||||||
return resp, err
|
return resp, err
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Body = ioutil.NopCloser(newContent)
|
resp.Body = io.NopCloser(newContent)
|
||||||
// Update header node with new content-length
|
// Update header node with new content-length
|
||||||
// TODO: Remove any hash/signature headers here?
|
// TODO: Remove any hash/signature headers here?
|
||||||
resp.Header.Del("Content-Length")
|
resp.Header.Del("Content-Length")
|
||||||
|
@ -21,7 +21,7 @@ import (
|
|||||||
"compress/flate"
|
"compress/flate"
|
||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"net/url"
|
"net/url"
|
||||||
@ -300,7 +300,7 @@ func TestProxyTransport(t *testing.T) {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
body, err := ioutil.ReadAll(resp.Body)
|
body, err := io.ReadAll(resp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("%v: Unexpected error: %v", name, err)
|
t.Errorf("%v: Unexpected error: %v", name, err)
|
||||||
return
|
return
|
||||||
@ -342,12 +342,12 @@ func TestRewriteResponse(t *testing.T) {
|
|||||||
gzw.Write([]byte(ept))
|
gzw.Write([]byte(ept))
|
||||||
gzw.Flush()
|
gzw.Flush()
|
||||||
return &http.Response{
|
return &http.Response{
|
||||||
Body: ioutil.NopCloser(gzipbuf),
|
Body: io.NopCloser(gzipbuf),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reader: func(rep *http.Response) string {
|
reader: func(rep *http.Response) string {
|
||||||
reader, _ := gzip.NewReader(rep.Body)
|
reader, _ := gzip.NewReader(rep.Body)
|
||||||
s, _ := ioutil.ReadAll(reader)
|
s, _ := io.ReadAll(reader)
|
||||||
return string(s)
|
return string(s)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -360,12 +360,12 @@ func TestRewriteResponse(t *testing.T) {
|
|||||||
flw.Write([]byte(ept))
|
flw.Write([]byte(ept))
|
||||||
flw.Flush()
|
flw.Flush()
|
||||||
return &http.Response{
|
return &http.Response{
|
||||||
Body: ioutil.NopCloser(flatebuf),
|
Body: io.NopCloser(flatebuf),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reader: func(rep *http.Response) string {
|
reader: func(rep *http.Response) string {
|
||||||
reader := flate.NewReader(rep.Body)
|
reader := flate.NewReader(rep.Body)
|
||||||
s, _ := ioutil.ReadAll(reader)
|
s, _ := io.ReadAll(reader)
|
||||||
return string(s)
|
return string(s)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -21,7 +21,6 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
@ -148,7 +147,7 @@ func (onewayRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
|||||||
return &http.Response{
|
return &http.Response{
|
||||||
Status: "200 OK",
|
Status: "200 OK",
|
||||||
StatusCode: http.StatusOK,
|
StatusCode: http.StatusOK,
|
||||||
Body: ioutil.NopCloser(&bytes.Buffer{}),
|
Body: io.NopCloser(&bytes.Buffer{}),
|
||||||
Request: req,
|
Request: req,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,6 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
@ -100,7 +99,7 @@ func (s *SimpleBackendHandler) ServeHTTP(w http.ResponseWriter, req *http.Reques
|
|||||||
s.requestHeader = req.Header
|
s.requestHeader = req.Header
|
||||||
s.requestMethod = req.Method
|
s.requestMethod = req.Method
|
||||||
var err error
|
var err error
|
||||||
s.requestBody, err = ioutil.ReadAll(req.Body)
|
s.requestBody, err = io.ReadAll(req.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.t.Errorf("Unexpected error: %v", err)
|
s.t.Errorf("Unexpected error: %v", err)
|
||||||
return
|
return
|
||||||
@ -370,7 +369,7 @@ func TestServeHTTP(t *testing.T) {
|
|||||||
validateHeaders(t, test.name+" backend headers", res.Header, test.expectedRespHeader, test.notExpectedRespHeader)
|
validateHeaders(t, test.name+" backend headers", res.Header, test.expectedRespHeader, test.notExpectedRespHeader)
|
||||||
|
|
||||||
// Validate Body
|
// Validate Body
|
||||||
responseBody, err := ioutil.ReadAll(res.Body)
|
responseBody, err := io.ReadAll(res.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Unexpected error reading response body: %v", err)
|
t.Errorf("Unexpected error reading response body: %v", err)
|
||||||
}
|
}
|
||||||
@ -601,7 +600,7 @@ func TestProxyUpgradeConnectionErrorResponse(t *testing.T) {
|
|||||||
// Expect error response.
|
// Expect error response.
|
||||||
assert.True(t, responder.called)
|
assert.True(t, responder.called)
|
||||||
assert.Equal(t, fakeStatusCode, resp.StatusCode)
|
assert.Equal(t, fakeStatusCode, resp.StatusCode)
|
||||||
msg, err := ioutil.ReadAll(resp.Body)
|
msg, err := io.ReadAll(resp.Body)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
assert.Contains(t, string(msg), expectedErr.Error())
|
assert.Contains(t, string(msg), expectedErr.Error())
|
||||||
}
|
}
|
||||||
@ -640,7 +639,7 @@ func TestProxyUpgradeErrorResponseTerminates(t *testing.T) {
|
|||||||
// Verify we get the correct response and full message body content
|
// Verify we get the correct response and full message body content
|
||||||
resp, err := http.ReadResponse(bufferedReader, nil)
|
resp, err := http.ReadResponse(bufferedReader, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
data, err := ioutil.ReadAll(resp.Body)
|
data, err := io.ReadAll(resp.Body)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, resp.StatusCode, code)
|
require.Equal(t, resp.StatusCode, code)
|
||||||
require.Equal(t, data, []byte(`some data`))
|
require.Equal(t, data, []byte(`some data`))
|
||||||
@ -790,7 +789,7 @@ func TestRejectForwardingRedirectsOption(t *testing.T) {
|
|||||||
resp, err := http.ReadResponse(bufferedReader, nil)
|
resp, err := http.ReadResponse(bufferedReader, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
assert.Equal(t, tc.expectStatusCode, resp.StatusCode)
|
assert.Equal(t, tc.expectStatusCode, resp.StatusCode)
|
||||||
data, err := ioutil.ReadAll(resp.Body)
|
data, err := io.ReadAll(resp.Body)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
assert.Equal(t, tc.expectBody, data)
|
assert.Equal(t, tc.expectBody, data)
|
||||||
assert.Equal(t, int64(len(tc.expectBody)), resp.ContentLength)
|
assert.Equal(t, int64(len(tc.expectBody)), resp.ContentLength)
|
||||||
@ -976,7 +975,7 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Read body
|
// Read body
|
||||||
body, err := ioutil.ReadAll(req.Body)
|
body, err := io.ReadAll(req.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("%s: unexpected error %v", k, err)
|
t.Errorf("%s: unexpected error %v", k, err)
|
||||||
}
|
}
|
||||||
@ -1039,7 +1038,7 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Read response
|
// Read response
|
||||||
response, err := ioutil.ReadAll(conn)
|
response, err := io.ReadAll(conn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("%s: unexpected error %v", k, err)
|
t.Errorf("%s: unexpected error %v", k, err)
|
||||||
continue
|
continue
|
||||||
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||||||
package testing
|
package testing
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
@ -43,7 +42,7 @@ func (f *Fake) OpenAPISchema() (*openapi_v2.Document, error) {
|
|||||||
f.err = err
|
f.err = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
spec, err := ioutil.ReadFile(f.Path)
|
spec, err := os.ReadFile(f.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
f.err = err
|
f.err = err
|
||||||
return
|
return
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
@ -45,7 +44,7 @@ stuff: 1
|
|||||||
}
|
}
|
||||||
|
|
||||||
for i, testCase := range testCases {
|
for i, testCase := range testCases {
|
||||||
r := NewDocumentDecoder(ioutil.NopCloser(bytes.NewReader([]byte(d))))
|
r := NewDocumentDecoder(io.NopCloser(bytes.NewReader([]byte(d))))
|
||||||
b := make([]byte, testCase.bufLen)
|
b := make([]byte, testCase.bufLen)
|
||||||
n, err := r.Read(b)
|
n, err := r.Read(b)
|
||||||
if err != testCase.expectErr || n != testCase.expectLen {
|
if err != testCase.expectErr || n != testCase.expectLen {
|
||||||
@ -62,7 +61,7 @@ stuff: 1
|
|||||||
bufferLen := 4 * 1024
|
bufferLen := 4 * 1024
|
||||||
// maxLen 5 M
|
// maxLen 5 M
|
||||||
dd := strings.Repeat(d, 512*1024)
|
dd := strings.Repeat(d, 512*1024)
|
||||||
r := NewDocumentDecoder(ioutil.NopCloser(bytes.NewReader([]byte(dd[:maxLen-1]))))
|
r := NewDocumentDecoder(io.NopCloser(bytes.NewReader([]byte(dd[:maxLen-1]))))
|
||||||
b := make([]byte, bufferLen)
|
b := make([]byte, bufferLen)
|
||||||
n, err := r.Read(b)
|
n, err := r.Read(b)
|
||||||
if err != io.ErrShortBuffer {
|
if err != io.ErrShortBuffer {
|
||||||
@ -73,7 +72,7 @@ stuff: 1
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("expected nil: %d / %v", n, err)
|
t.Fatalf("expected nil: %d / %v", n, err)
|
||||||
}
|
}
|
||||||
r = NewDocumentDecoder(ioutil.NopCloser(bytes.NewReader([]byte(dd))))
|
r = NewDocumentDecoder(io.NopCloser(bytes.NewReader([]byte(dd))))
|
||||||
b = make([]byte, maxLen)
|
b = make([]byte, maxLen)
|
||||||
n, err = r.Read(b)
|
n, err = r.Read(b)
|
||||||
if err != bufio.ErrTooLong {
|
if err != bufio.ErrTooLong {
|
||||||
@ -85,7 +84,7 @@ func TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame(t *testing.T) {
|
|||||||
d := `---
|
d := `---
|
||||||
stuff: 1
|
stuff: 1
|
||||||
test-foo: 1`
|
test-foo: 1`
|
||||||
r := NewDocumentDecoder(ioutil.NopCloser(bytes.NewReader([]byte(d))))
|
r := NewDocumentDecoder(io.NopCloser(bytes.NewReader([]byte(d))))
|
||||||
b := make([]byte, 12)
|
b := make([]byte, 12)
|
||||||
n, err := r.Read(b)
|
n, err := r.Read(b)
|
||||||
if err != io.ErrShortBuffer || n != 12 {
|
if err != io.ErrShortBuffer || n != 12 {
|
||||||
|
Loading…
Reference in New Issue
Block a user