Extract waitForRead
This commit is contained in:
+9
-36
@@ -44,6 +44,15 @@ func createCreateResourceFunc() (puddle.CreateFunc, *Counter) {
|
|||||||
|
|
||||||
func stubCloseRes(interface{}) error { return nil }
|
func stubCloseRes(interface{}) error { return nil }
|
||||||
|
|
||||||
|
func waitForRead(ch chan int) bool {
|
||||||
|
select {
|
||||||
|
case <-ch:
|
||||||
|
return true
|
||||||
|
case <-time.NewTimer(time.Second).C:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestPoolGetCreatesResourceWhenNoneAvailable(t *testing.T) {
|
func TestPoolGetCreatesResourceWhenNoneAvailable(t *testing.T) {
|
||||||
createFunc, _ := createCreateResourceFunc()
|
createFunc, _ := createCreateResourceFunc()
|
||||||
pool := puddle.NewPool(createFunc, stubCloseRes)
|
pool := puddle.NewPool(createFunc, stubCloseRes)
|
||||||
@@ -179,15 +188,6 @@ func TestPoolReturnClosesAndRemovesResourceIfOlderThanMaxDuration(t *testing.T)
|
|||||||
func TestPoolReturnClosesAndRemovesResourceIfMoreUsesThanMaxResourceUses(t *testing.T) {
|
func TestPoolReturnClosesAndRemovesResourceIfMoreUsesThanMaxResourceUses(t *testing.T) {
|
||||||
closeCallsChan := make(chan int, 4)
|
closeCallsChan := make(chan int, 4)
|
||||||
|
|
||||||
waitForRead := func(ch chan int) bool {
|
|
||||||
select {
|
|
||||||
case <-ch:
|
|
||||||
return true
|
|
||||||
case <-time.NewTimer(time.Second).C:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
createFunc, _ := createCreateResourceFunc()
|
createFunc, _ := createCreateResourceFunc()
|
||||||
var closeCalls Counter
|
var closeCalls Counter
|
||||||
closeFunc := func(interface{}) error {
|
closeFunc := func(interface{}) error {
|
||||||
@@ -240,15 +240,6 @@ func TestPoolCloseClosesAllAvailableResources(t *testing.T) {
|
|||||||
func TestPoolReturnClosesResourcePoolIsAlreadyClosed(t *testing.T) {
|
func TestPoolReturnClosesResourcePoolIsAlreadyClosed(t *testing.T) {
|
||||||
closeCallsChan := make(chan int, 4)
|
closeCallsChan := make(chan int, 4)
|
||||||
|
|
||||||
waitForRead := func(ch chan int) bool {
|
|
||||||
select {
|
|
||||||
case <-ch:
|
|
||||||
return true
|
|
||||||
case <-time.NewTimer(time.Second).C:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
createFunc, _ := createCreateResourceFunc()
|
createFunc, _ := createCreateResourceFunc()
|
||||||
|
|
||||||
var closeCalls Counter
|
var closeCalls Counter
|
||||||
@@ -306,15 +297,6 @@ func TestPoolRemoveRemovesResourceFromPoolAndStartsNewCreationToMaintainMinSize(
|
|||||||
createCallsChan := make(chan int, 4)
|
createCallsChan := make(chan int, 4)
|
||||||
closeCallsChan := make(chan int, 4)
|
closeCallsChan := make(chan int, 4)
|
||||||
|
|
||||||
waitForRead := func(ch chan int) bool {
|
|
||||||
select {
|
|
||||||
case <-ch:
|
|
||||||
return true
|
|
||||||
case <-time.NewTimer(time.Second).C:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var createCalls Counter
|
var createCalls Counter
|
||||||
createFunc := func() (interface{}, error) {
|
createFunc := func() (interface{}, error) {
|
||||||
n := createCalls.Next()
|
n := createCalls.Next()
|
||||||
@@ -370,15 +352,6 @@ func TestPoolRemoveRemovesResourceFromPoolAndDoesNotStartNewCreationToMaintainMi
|
|||||||
createCallsChan := make(chan int, 4)
|
createCallsChan := make(chan int, 4)
|
||||||
closeCallsChan := make(chan int, 4)
|
closeCallsChan := make(chan int, 4)
|
||||||
|
|
||||||
waitForRead := func(ch chan int) bool {
|
|
||||||
select {
|
|
||||||
case <-ch:
|
|
||||||
return true
|
|
||||||
case <-time.NewTimer(time.Second).C:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var createCalls Counter
|
var createCalls Counter
|
||||||
createFunc := func() (interface{}, error) {
|
createFunc := func() (interface{}, error) {
|
||||||
n := createCalls.Next()
|
n := createCalls.Next()
|
||||||
|
|||||||
Reference in New Issue
Block a user