fixes waitTimeout, waitDelay not working with float

This commit is contained in:
Julien Neuhart
2019-07-08 17:24:17 +02:00
parent 186c09f29b
commit 9af00d6d58
11 changed files with 110 additions and 18 deletions

View File

@@ -0,0 +1,3 @@
// Package timeout helps managing
// context with timeout.
package timeout

View File

@@ -0,0 +1,43 @@
package timeout
import (
"context"
"strings"
"time"
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
)
// Context creates a context with timeout for
// given second.
func Context(seconds float64) (context.Context, context.CancelFunc) {
return context.WithTimeout(context.Background(), Duration(seconds))
}
// Duration creates a duration from seconds.
func Duration(seconds float64) time.Duration {
return time.Duration(1000*seconds) * time.Millisecond
}
// Err returns a standarderror.Error
// if the context has an error.
func Err(ctx context.Context) error {
const op = "timeout.Err"
err := ctx.Err()
if err == nil {
return nil
}
if strings.Contains(err.Error(), context.DeadlineExceeded.Error()) {
return &standarderror.Error{
Code: standarderror.Timeout,
Message: "context has timed out",
Op: op,
Err: err,
}
}
return &standarderror.Error{
Message: "context finished with an error",
Op: op,
Err: err,
}
}

View File

@@ -0,0 +1,38 @@
package timeout
import (
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/thecodingmachine/gotenberg/internal/pkg/standarderror"
"github.com/thecodingmachine/gotenberg/test"
)
func TestDuration(t *testing.T) {
expected := time.Duration(1500) * time.Millisecond
result := Duration(1.5)
assert.Equal(t, expected.String(), result.String())
}
func TestErr(t *testing.T) {
// should be OK.
ctx, cancel := Context(5)
defer cancel()
assert.Nil(t, Err(ctx))
// should timeout.
ctx, cancel = Context(0.5)
defer cancel()
time.Sleep(Duration(1))
err := Err(ctx)
assert.NotNil(t, err)
standardized := test.RequireStandardError(t, err)
assert.Equal(t, standardized.Code, standarderror.Timeout)
// should failed.
ctx, cancel = Context(5)
cancel()
err = Err(ctx)
assert.NotNil(t, err)
standardized = test.RequireStandardError(t, err)
assert.Equal(t, standarderror.Code(err), standarderror.Internal)
}