Skip to content

Commit

Permalink
fix linter + ci
Browse files Browse the repository at this point in the history
  • Loading branch information
nikifkon committed Aug 4, 2023
1 parent a568e78 commit b618922
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2

- name: unit tests
run: make unittest
run: make unittest_with_race

e2e:
name: e2e
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ pooler_run:

####################### TESTS #######################

unittest_with_race:
go test -race ./cmd/... ./pkg/... ./router/... ./qdb/...

unittest:
go test ./cmd/... ./pkg/... ./router/... ./qdb/...

Expand Down
92 changes: 61 additions & 31 deletions qdb/memqdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,72 @@ func TestMemqdbRacing(t *testing.T) {
assert.NoError(err)

var wg sync.WaitGroup

ctx := context.TODO()

methods := []func(){
func() { memqdb.AddDataspace(ctx, mockDataspace) },
func() { memqdb.AddKeyRange(ctx, mockKeyRange) },
func() { memqdb.AddRouter(ctx, mockRouter) },
func() { memqdb.AddShard(ctx, mockShard) },
func() { memqdb.AddShardingRule(ctx, mockShardingRule) },
func() {
memqdb.RecordTransferTx(ctx, mockDataTransferTransaction.FromShardId, mockDataTransferTransaction)
methods := []func() error{
func() error { return memqdb.AddDataspace(ctx, mockDataspace) },
func() error { return memqdb.AddKeyRange(ctx, mockKeyRange) },
func() error { return memqdb.AddRouter(ctx, mockRouter) },
func() error { return memqdb.AddShard(ctx, mockShard) },
func() error { return memqdb.AddShardingRule(ctx, mockShardingRule) },
func() error {
return memqdb.RecordTransferTx(ctx, mockDataTransferTransaction.FromShardId, mockDataTransferTransaction)
},
func() error {
_, err_local := memqdb.ListDataspaces(ctx)
return err_local
},
func() error {
_, err_local := memqdb.ListKeyRanges(ctx)
return err_local
},
func() error {
_, err_local := memqdb.ListRouters(ctx)
return err_local
},
func() error {
_, err_local := memqdb.ListShardingRules(ctx)
return err_local
},
func() error {
_, err_local := memqdb.ListShards(ctx)
return err_local
},
func() { memqdb.ListDataspaces(ctx) },
func() { memqdb.ListKeyRanges(ctx) },
func() { memqdb.ListRouters(ctx) },
func() { memqdb.ListShardingRules(ctx) },
func() { memqdb.ListShards(ctx) },
func() { memqdb.GetKeyRange(ctx, mockKeyRange.KeyRangeID) },
func() { memqdb.GetShard(ctx, mockShard.ID) },
func() { memqdb.GetShardingRule(ctx, mockShardingRule.ID) },
func() { memqdb.GetTransferTx(ctx, mockDataTransferTransaction.FromShardId) },
func() { memqdb.ShareKeyRange(mockKeyRange.KeyRangeID) },
func() { memqdb.DropKeyRange(ctx, mockKeyRange.KeyRangeID) },
func() { memqdb.DropKeyRangeAll(ctx) },
func() { memqdb.DropShardingRule(ctx, mockShardingRule.ID) },
func() { memqdb.DropShardingRuleAll(ctx) },
func() { memqdb.RemoveTransferTx(ctx, mockDataTransferTransaction.FromShardId) },
func() error {
_, err_local := memqdb.GetKeyRange(ctx, mockKeyRange.KeyRangeID)
return err_local
},
func() error {
_, err_local := memqdb.GetShard(ctx, mockShard.ID)
return err_local
},
func() error {
_, err_local := memqdb.GetShardingRule(ctx, mockShardingRule.ID)
return err_local
},
func() error {
_, err_local := memqdb.GetTransferTx(ctx, mockDataTransferTransaction.FromShardId)
return err_local
},
func() error { return memqdb.ShareKeyRange(mockKeyRange.KeyRangeID) },
func() error { return memqdb.DropKeyRange(ctx, mockKeyRange.KeyRangeID) },
func() error { return memqdb.DropKeyRangeAll(ctx) },
func() error { return memqdb.DropShardingRule(ctx, mockShardingRule.ID) },
func() error {
_, err_local := memqdb.DropShardingRuleAll(ctx)
return err_local
},
func() error { return memqdb.RemoveTransferTx(ctx, mockDataTransferTransaction.FromShardId) },
}

for _, m := range methods {
wg.Add(1)
go func(m func()) {
m()
wg.Done()
}(m)
for i := 0; i < 10; i++ {
for _, m := range methods {
wg.Add(1)
go func(m func() error) {
_ = m()
wg.Done()
}(m)
}
}

wg.Wait()
}

0 comments on commit b618922

Please sign in to comment.