Fixup test
This commit is contained in:
parent
7f48033d0b
commit
55b5c1a073
|
@ -351,10 +351,14 @@ func (s *Server) realHandleStream(streamReq HandleStreamRequest) error {
|
|||
err := streamReq.Stream.Send(msg)
|
||||
sendMutex.Unlock()
|
||||
|
||||
if err != nil {
|
||||
status.TrackSendError(err.Error())
|
||||
} else {
|
||||
status.TrackSendSuccess()
|
||||
// We only track send successes and errors for response types because this is meant to track
|
||||
// resources, not request/ack messages.
|
||||
if msg.GetResponse() != nil {
|
||||
if err != nil {
|
||||
status.TrackSendError(err.Error())
|
||||
} else {
|
||||
status.TrackSendSuccess()
|
||||
}
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -572,9 +572,15 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
})
|
||||
|
||||
var lastSendAck time.Time
|
||||
var lastSendSuccess time.Time
|
||||
|
||||
client.DrainStream(t)
|
||||
|
||||
// Manually grab the last success time from sending the trust bundle or exported services list.
|
||||
status, ok := srv.StreamStatus(testPeerID)
|
||||
require.True(t, ok)
|
||||
lastSendSuccess = status.LastSendSuccess
|
||||
|
||||
testutil.RunStep(t, "ack tracked as success", func(t *testing.T) {
|
||||
ack := &pbpeerstream.ReplicationMessage{
|
||||
Payload: &pbpeerstream.ReplicationMessage_Request_{
|
||||
|
@ -589,11 +595,13 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
}
|
||||
|
||||
lastSendAck = it.FutureNow(1)
|
||||
|
||||
err := client.Send(ack)
|
||||
require.NoError(t, err)
|
||||
|
||||
expect := Status{
|
||||
Connected: true,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
ExportedServices: []string{},
|
||||
}
|
||||
|
@ -631,6 +639,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
|
||||
expect := Status{
|
||||
Connected: true,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
LastNack: lastNack,
|
||||
LastNackMessage: lastNackMsg,
|
||||
|
@ -682,6 +691,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
|
||||
expect := Status{
|
||||
Connected: true,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
LastNack: lastNack,
|
||||
LastNackMessage: lastNackMsg,
|
||||
|
@ -737,6 +747,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
|
||||
expect := Status{
|
||||
Connected: true,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
LastNack: lastNack,
|
||||
LastNackMessage: lastNackMsg,
|
||||
|
@ -766,6 +777,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
|
||||
expect := Status{
|
||||
Connected: true,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
LastNack: lastNack,
|
||||
LastNackMessage: lastNackMsg,
|
||||
|
@ -793,6 +805,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
|
|||
expect := Status{
|
||||
Connected: false,
|
||||
DisconnectErrorMessage: lastRecvErrorMsg,
|
||||
LastSendSuccess: lastSendSuccess,
|
||||
LastAck: lastSendAck,
|
||||
LastNack: lastNack,
|
||||
LastNackMessage: lastNackMsg,
|
||||
|
|
Loading…
Reference in New Issue