Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

* : testify all pkg tests #5091

Merged
merged 3 commits into from
Jun 2, 2022
Merged

* : testify all pkg tests #5091

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7013d5d
Testify some pkg tests
JmPotato Jun 2, 2022
01cdd9e
Rename some tests
JmPotato Jun 2, 2022
203850a
Merge branch 'master' into testify_pkg
ti-chi-bot Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/progress/progress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/require"
)

func Test(t *testing.T) {
func TestProgress(t *testing.T) {
re := require.New(t)
n := "test"
m := NewManager()
Expand Down
57 changes: 25 additions & 32 deletions pkg/rangetree/range_tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,10 @@ import (
"bytes"
"testing"

. "github.com/pingcap/check"
"github.com/stretchr/testify/require"
"github.com/tikv/pd/pkg/btree"
)

func Test(t *testing.T) {
TestingT(t)
}

var _ = Suite(&testRangeTreeSuite{})

type testRangeTreeSuite struct {
}

type simpleBucketItem struct {
startKey []byte
endKey []byte
Expand Down Expand Up @@ -79,7 +70,7 @@ func bucketDebrisFactory(startKey, endKey []byte, item RangeItem) []RangeItem {

left := maxKey(startKey, item.GetStartKey())
right := minKey(endKey, item.GetEndKey())
// they have no intersection if they are neighbour like |010 - 100| and |100 - 200|.
// they have no intersection if they are neighbors like |010 - 100| and |100 - 200|.
if bytes.Compare(left, right) >= 0 {
return nil
}
Expand All @@ -94,52 +85,54 @@ func bucketDebrisFactory(startKey, endKey []byte, item RangeItem) []RangeItem {
return res
}

func (bs *testRangeTreeSuite) TestRingPutItem(c *C) {
func TestRingPutItem(t *testing.T) {
re := require.New(t)
bucketTree := NewRangeTree(2, bucketDebrisFactory)
bucketTree.Update(newSimpleBucketItem([]byte("002"), []byte("100")))
c.Assert(bucketTree.Len(), Equals, 1)
re.Equal(1, bucketTree.Len())
bucketTree.Update(newSimpleBucketItem([]byte("100"), []byte("200")))
c.Assert(bucketTree.Len(), Equals, 2)
re.Equal(2, bucketTree.Len())

// init key range: [002,100], [100,200]
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("000"), []byte("002"))), HasLen, 0)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("000"), []byte("009"))), HasLen, 1)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), HasLen, 1)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("110"))), HasLen, 2)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("200"), []byte("300"))), HasLen, 0)
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("000"), []byte("002"))), 0)
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("000"), []byte("009"))), 1)
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), 1)
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("110"))), 2)
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("200"), []byte("300"))), 0)

// test1： insert one key range, the old overlaps will retain like split buckets.
// key range: [002,010],[010,090],[090,100],[100,200]
bucketTree.Update(newSimpleBucketItem([]byte("010"), []byte("090")))
c.Assert(bucketTree.Len(), Equals, 4)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), HasLen, 1)
re.Equal(4, bucketTree.Len())
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), 1)

// test2: insert one key range, the old overlaps will retain like merge .
// key range: [001,080], [080,090],[090,100],[100,200]
bucketTree.Update(newSimpleBucketItem([]byte("001"), []byte("080")))
c.Assert(bucketTree.Len(), Equals, 4)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), HasLen, 2)
re.Equal(4, bucketTree.Len())
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), 2)

// test2: insert one keyrange, the old overlaps will retain like merge .
// key range: [001,120],[120,200]
bucketTree.Update(newSimpleBucketItem([]byte("001"), []byte("120")))
c.Assert(bucketTree.Len(), Equals, 2)
c.Assert(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), HasLen, 1)
re.Equal(2, bucketTree.Len())
re.Len(bucketTree.GetOverlaps(newSimpleBucketItem([]byte("010"), []byte("090"))), 1)
}

func (bs *testRangeTreeSuite) TestDebris(c *C) {
func TestDebris(t *testing.T) {
re := require.New(t)
ringItem := newSimpleBucketItem([]byte("010"), []byte("090"))
var overlaps []RangeItem
overlaps = bucketDebrisFactory([]byte("000"), []byte("100"), ringItem)
c.Assert(overlaps, HasLen, 0)
re.Len(overlaps, 0)
overlaps = bucketDebrisFactory([]byte("000"), []byte("080"), ringItem)
c.Assert(overlaps, HasLen, 1)
re.Len(overlaps, 1)
overlaps = bucketDebrisFactory([]byte("020"), []byte("080"), ringItem)
c.Assert(overlaps, HasLen, 2)
re.Len(overlaps, 2)
overlaps = bucketDebrisFactory([]byte("010"), []byte("090"), ringItem)
c.Assert(overlaps, HasLen, 0)
re.Len(overlaps, 0)
overlaps = bucketDebrisFactory([]byte("010"), []byte("100"), ringItem)
c.Assert(overlaps, HasLen, 0)
re.Len(overlaps, 0)
overlaps = bucketDebrisFactory([]byte("100"), []byte("200"), ringItem)
c.Assert(overlaps, HasLen, 0)
re.Len(overlaps, 0)
}
29 changes: 12 additions & 17 deletions pkg/ratelimit/concurrency_limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,24 @@
package ratelimit

import (
. "github.com/pingcap/check"
)

var _ = Suite(&testConcurrencyLimiterSuite{})

type testConcurrencyLimiterSuite struct {
}
"testing"

func (s *testConcurrencyLimiterSuite) TestConcurrencyLimiter(c *C) {
c.Parallel()
"github.com/stretchr/testify/require"
)

func TestConcurrencyLimiter(t *testing.T) {
re := require.New(t)
cl := newConcurrencyLimiter(10)

for i := 0; i < 10; i++ {
c.Assert(cl.allow(), Equals, true)
re.True(cl.allow())
}
c.Assert(cl.allow(), Equals, false)
re.False(cl.allow())
cl.release()
c.Assert(cl.allow(), Equals, true)
c.Assert(cl.getLimit(), Equals, uint64(10))
re.True(cl.allow())
re.Equal(uint64(10), cl.getLimit())
cl.setLimit(5)
c.Assert(cl.getLimit(), Equals, uint64(5))
c.Assert(cl.getCurrent(), Equals, uint64(10))
re.Equal(uint64(5), cl.getLimit())
re.Equal(uint64(10), cl.getCurrent())
cl.release()
c.Assert(cl.getCurrent(), Equals, uint64(9))
re.Equal(uint64(9), cl.getCurrent())
}
Loading