tq: TransferAdapterName property has to be public because of the json tag
This commit is contained in:
parent
dfacd12c41
commit
312a26060a
@ -21,8 +21,8 @@ type batchRequest struct {
|
||||
|
||||
type BatchResponse struct {
|
||||
Objects []*Transfer `json:"objects"`
|
||||
TransferAdapterName string `json:"transfer"`
|
||||
endpoint lfsapi.Endpoint
|
||||
transferAdapterName string `json:"transfer"`
|
||||
}
|
||||
|
||||
func Batch(m *Manifest, dir Direction, remote string, objects []*Transfer) (*BatchResponse, error) {
|
||||
|
@ -31,7 +31,7 @@ func TestAPIBatch(t *testing.T) {
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
err = json.NewEncoder(w).Encode(&BatchResponse{
|
||||
transferAdapterName: "basic",
|
||||
TransferAdapterName: "basic",
|
||||
Objects: bReq.Objects,
|
||||
})
|
||||
}))
|
||||
@ -52,7 +52,7 @@ func TestAPIBatch(t *testing.T) {
|
||||
bRes, res, err := tqc.Batch("remote", bReq)
|
||||
require.Nil(t, err)
|
||||
assert.Equal(t, 200, res.StatusCode)
|
||||
assert.Equal(t, "basic", bRes.transferAdapterName)
|
||||
assert.Equal(t, "basic", bRes.TransferAdapterName)
|
||||
if assert.Equal(t, 1, len(bRes.Objects)) {
|
||||
assert.Equal(t, "a", bRes.Objects[0].Oid)
|
||||
}
|
||||
@ -78,7 +78,7 @@ func TestAPIBatchOnlyBasic(t *testing.T) {
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
err = json.NewEncoder(w).Encode(&BatchResponse{
|
||||
transferAdapterName: "basic",
|
||||
TransferAdapterName: "basic",
|
||||
})
|
||||
}))
|
||||
defer srv.Close()
|
||||
@ -98,7 +98,7 @@ func TestAPIBatchOnlyBasic(t *testing.T) {
|
||||
bRes, res, err := tqc.Batch("remote", bReq)
|
||||
require.Nil(t, err)
|
||||
assert.Equal(t, 200, res.StatusCode)
|
||||
assert.Equal(t, "basic", bRes.transferAdapterName)
|
||||
assert.Equal(t, "basic", bRes.TransferAdapterName)
|
||||
}
|
||||
|
||||
func TestAPIBatchEmptyObjects(t *testing.T) {
|
||||
@ -112,6 +112,6 @@ func TestAPIBatchEmptyObjects(t *testing.T) {
|
||||
bRes, res, err := tqc.Batch("remote", bReq)
|
||||
require.Nil(t, err)
|
||||
assert.Nil(t, res)
|
||||
assert.Equal(t, "", bRes.transferAdapterName)
|
||||
assert.Equal(t, "", bRes.TransferAdapterName)
|
||||
assert.Equal(t, 0, len(bRes.Objects))
|
||||
}
|
||||
|
@ -311,7 +311,7 @@ func (q *TransferQueue) enqueueAndCollectRetriesFor(batch batch) (batch, error)
|
||||
return next, nil
|
||||
}
|
||||
|
||||
q.useAdapter(bRes.transferAdapterName)
|
||||
q.useAdapter(bRes.TransferAdapterName)
|
||||
q.startProgress.Do(q.meter.Start)
|
||||
|
||||
toTransfer := make([]*Transfer, 0, len(bRes.Objects))
|
||||
|
Loading…
Reference in New Issue
Block a user