Cleanup some assertions
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
073963e3b7
commit
ef01dea893
|
@ -69,6 +69,8 @@ type logStream struct {
|
||||||
sequenceToken *string
|
sequenceToken *string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _ logger.SizedLogger = &logStream{}
|
||||||
|
|
||||||
type api interface {
|
type api interface {
|
||||||
CreateLogGroup(*cloudwatchlogs.CreateLogGroupInput) (*cloudwatchlogs.CreateLogGroupOutput, error)
|
CreateLogGroup(*cloudwatchlogs.CreateLogGroupInput) (*cloudwatchlogs.CreateLogGroupOutput, error)
|
||||||
CreateLogStream(*cloudwatchlogs.CreateLogStreamInput) (*cloudwatchlogs.CreateLogStreamOutput, error)
|
CreateLogStream(*cloudwatchlogs.CreateLogStreamInput) (*cloudwatchlogs.CreateLogStreamOutput, error)
|
||||||
|
|
|
@ -1143,11 +1143,6 @@ func TestCreateTagSuccess(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestIsSizedLogger(t *testing.T) {
|
|
||||||
awslogs := &logStream{}
|
|
||||||
assert.Implements(t, (*logger.SizedLogger)(nil), awslogs, "awslogs should implement SizedLogger")
|
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkUnwrapEvents(b *testing.B) {
|
func BenchmarkUnwrapEvents(b *testing.B) {
|
||||||
events := make([]wrappedEvent, maximumLogEventsPerPut)
|
events := make([]wrappedEvent, maximumLogEventsPerPut)
|
||||||
for i := 0; i < maximumLogEventsPerPut; i++ {
|
for i := 0; i < maximumLogEventsPerPut; i++ {
|
||||||
|
@ -1157,11 +1152,10 @@ func BenchmarkUnwrapEvents(b *testing.B) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
as := assert.New(b)
|
|
||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
res := unwrapEvents(events)
|
res := unwrapEvents(events)
|
||||||
as.Len(res, maximumLogEventsPerPut)
|
assert.Len(b, res, maximumLogEventsPerPut)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,9 @@ package term // import "github.com/docker/docker/pkg/term"
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -25,7 +25,8 @@ func TestEscapeProxyRead(t *testing.T) {
|
||||||
nr, err = reader.Read(buf)
|
nr, err = reader.Read(buf)
|
||||||
require.Error(t, err, "Should throw error when no keys are to read")
|
require.Error(t, err, "Should throw error when no keys are to read")
|
||||||
require.EqualValues(t, nr, 0, "nr should be zero")
|
require.EqualValues(t, nr, 0, "nr should be zero")
|
||||||
require.Condition(t, func() (success bool) { return len(keys) == 0 && len(buf) == 0 }, "keys & the read buffer size should be zero")
|
assert.Len(t, keys, 0)
|
||||||
|
assert.Len(t, buf, 0)
|
||||||
|
|
||||||
escapeKeys, _ = ToBytes("ctrl-x,ctrl-@")
|
escapeKeys, _ = ToBytes("ctrl-x,ctrl-@")
|
||||||
keys, _ = ToBytes("DEL")
|
keys, _ = ToBytes("DEL")
|
||||||
|
@ -41,9 +42,7 @@ func TestEscapeProxyRead(t *testing.T) {
|
||||||
reader = NewEscapeProxy(bytes.NewReader(keys), escapeKeys)
|
reader = NewEscapeProxy(bytes.NewReader(keys), escapeKeys)
|
||||||
buf = make([]byte, len(keys))
|
buf = make([]byte, len(keys))
|
||||||
nr, err = reader.Read(buf)
|
nr, err = reader.Read(buf)
|
||||||
require.Condition(t, func() (success bool) {
|
require.EqualError(t, err, "read escape sequence")
|
||||||
return reflect.TypeOf(err).Name() == "EscapeError"
|
|
||||||
}, err)
|
|
||||||
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
||||||
require.Equal(t, keys, buf, "keys & the read buffer should be equal")
|
require.Equal(t, keys, buf, "keys & the read buffer should be equal")
|
||||||
|
|
||||||
|
@ -56,9 +55,7 @@ func TestEscapeProxyRead(t *testing.T) {
|
||||||
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
||||||
require.Equal(t, keys[0:1], buf, "keys & the read buffer should be equal")
|
require.Equal(t, keys[0:1], buf, "keys & the read buffer should be equal")
|
||||||
nr, err = reader.Read(buf)
|
nr, err = reader.Read(buf)
|
||||||
require.Condition(t, func() (success bool) {
|
require.EqualError(t, err, "read escape sequence")
|
||||||
return reflect.TypeOf(err).Name() == "EscapeError"
|
|
||||||
}, err)
|
|
||||||
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
require.EqualValues(t, nr, 0, "nr should be equal to 0")
|
||||||
require.Equal(t, keys[1:], buf, "keys & the read buffer should be equal")
|
require.Equal(t, keys[1:], buf, "keys & the read buffer should be equal")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue