Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit d1890aa402 - Show all commits

View File

@ -17,7 +17,6 @@
package fdlimit package fdlimit
import ( import (
"fmt"
"testing" "testing"
) )
@ -30,7 +29,7 @@ func TestFileDescriptorLimits(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if hardlimit < target { if hardlimit < target {
t.Skip(fmt.Sprintf("system limit is less than desired test target: %d < %d", hardlimit, target)) t.Skipf("system limit is less than desired test target: %d < %d", hardlimit, target)
} }
if limit, err := Current(); err != nil || limit <= 0 { if limit, err := Current(); err != nil || limit <= 0 {