Skip to content

Commit

Permalink
update redigo and restructure (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
xh3b4sd committed Oct 11, 2023
1 parent 7c70d6c commit b7da1fc
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 191 deletions.
16 changes: 3 additions & 13 deletions engine/engine_balance_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"strconv"
"testing"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Balance(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
44 changes: 9 additions & 35 deletions engine/engine_create_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"fmt"
"testing"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Create(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -241,18 +231,10 @@ func Test_Engine_Create_Cron(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -439,18 +421,10 @@ func Test_Engine_Create_Root_First(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
16 changes: 3 additions & 13 deletions engine/engine_delete_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Delete(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
16 changes: 3 additions & 13 deletions engine/engine_exists_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Exists(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
16 changes: 3 additions & 13 deletions engine/engine_expire_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Expire(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
16 changes: 3 additions & 13 deletions engine/engine_extend_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Extend(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
74 changes: 16 additions & 58 deletions engine/engine_lifecycle_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
"github.com/xh3b4sd/rescue/timer"
"github.com/xh3b4sd/tracer"
Expand All @@ -22,21 +20,13 @@ func Test_Engine_Lifecycle_Cron_Weekday(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal("expected", true, "got", false)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal("expected", true, "got", false)
t.Fatal(err)
}
}

Expand Down Expand Up @@ -203,18 +193,10 @@ func Test_Engine_Lifecycle_Cron_Failure(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -732,18 +714,10 @@ func Test_Engine_Lifecycle_Cron_Resolve(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -1156,18 +1130,10 @@ func Test_Engine_Lifecycle_Race(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -1377,18 +1343,10 @@ func Test_Engine_Lifecycle_Sync(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
16 changes: 3 additions & 13 deletions engine/engine_lister_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"
"time"

"github.com/xh3b4sd/budget/v3/pkg/breaker"
"github.com/xh3b4sd/logger"
"github.com/xh3b4sd/redigo"
"github.com/xh3b4sd/redigo/pkg/client"
"github.com/xh3b4sd/rescue/task"
)

Expand All @@ -18,18 +16,10 @@ func Test_Engine_Lister(t *testing.T) {

var red redigo.Interface
{
c := client.Config{
Kind: client.KindSingle,
Locker: client.ConfigLocker{
Budget: breaker.Default(),
},
}

red, err = client.New(c)
if err != nil {
t.Fatal(err)
}
red = redigo.Default()
}

{
err = red.Purge()
if err != nil {
t.Fatal(err)
Expand Down
Loading

0 comments on commit b7da1fc

Please sign in to comment.