scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up request logic and use retryable's more efficient handling (#4670)

Browse Source
This commit is contained in:
Jeff Mitchell
2018-06-01 09:12:43 -04:00
committed by GitHub
parent 2b7440524e
commit 1d4d302bfa
3 changed files with 56 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/request_test.go
View File

@@ -1,8 +1,6 @@
package api
import (
"bytes"
"io"
"strings"
"testing"
)
@@ -14,20 +12,11 @@ func TestRequestSetJSONBody(t *testing.T) {
t.Fatalf("err: %s", err)
}
var buf bytes.Buffer
if _, err := io.Copy(&buf, r.Body); err != nil {
t.Fatalf("err: %s", err)
}
expected := `{"foo":"bar"}`
actual := strings.TrimSpace(buf.String())
actual := strings.TrimSpace(string(r.BodyBytes))
if actual != expected {
t.Fatalf("bad: %s", actual)
}
if int64(len(buf.String())) != r.BodySize {
t.Fatalf("bad: %d", len(actual))
}
}
func TestRequestResetJSONBody(t *testing.T) {
@@ -37,27 +26,16 @@ func TestRequestResetJSONBody(t *testing.T) {
t.Fatalf("err: %s", err)
}
var buf bytes.Buffer
if _, err := io.Copy(&buf, r.Body); err != nil {
t.Fatalf("err: %s", err)
}
if err := r.ResetJSONBody(); err != nil {
t.Fatalf("err: %s", err)
}
var buf2 bytes.Buffer
if _, err := io.Copy(&buf2, r.Body); err != nil {
t.Fatalf("err: %s", err)
}
buf := make([]byte, len(r.BodyBytes))
copy(buf, r.BodyBytes)
expected := `{"foo":"bar"}`
actual := strings.TrimSpace(buf2.String())
actual := strings.TrimSpace(string(buf))
if actual != expected {
t.Fatalf("bad: %s", actual)
}
if int64(len(buf2.String())) != r.BodySize {
t.Fatalf("bad: %d", len(actual))
t.Fatalf("bad: actual %s, expected %s", actual, expected)
}
}