You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kvrocks.apache.org by ti...@apache.org on 2022/10/03 04:18:55 UTC
[incubator-kvrocks] branch unstable updated: test: tidy constants (#937)
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new 8f57d63 test: tidy constants (#937)
8f57d63 is described below
commit 8f57d6334dc39843bf89395f41ed0426b006a676
Author: tison <wa...@gmail.com>
AuthorDate: Mon Oct 3 12:18:49 2022 +0800
test: tidy constants (#937)
Signed-off-by: tison <wa...@gmail.com>
---
tests/gocase/unit/scripting/scripting_test.go | 15 ++++++++-------
tests/gocase/util/constants.go | 5 +++--
tests/gocase/util/server.go | 2 +-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/gocase/unit/scripting/scripting_test.go b/tests/gocase/unit/scripting/scripting_test.go
index 2fbee2f..70593c6 100644
--- a/tests/gocase/unit/scripting/scripting_test.go
+++ b/tests/gocase/unit/scripting/scripting_test.go
@@ -25,6 +25,7 @@ import (
"testing"
"github.com/apache/incubator-kvrocks/tests/gocase/util"
+ "github.com/go-redis/redis/v9"
"github.com/stretchr/testify/require"
)
@@ -62,7 +63,7 @@ func TestScripting(t *testing.T) {
t.Run("EVAL - Lua false boolean -> Redis protocol type conversion", func(t *testing.T) {
r := rdb.Eval(ctx, `return false`, []string{})
- require.EqualError(t, r.Err(), util.ErrRedisNil)
+ require.EqualError(t, r.Err(), redis.Nil.Error())
require.Nil(t, r.Val())
})
@@ -311,7 +312,7 @@ assert(tostring(0xffffffff) == "-1" or
tostring(0xffffffff) == "4294967295",
"broken tostring()")
`, []string{})
- require.EqualError(t, r.Err(), util.ErrRedisNil)
+ require.EqualError(t, r.Err(), redis.Nil.Error())
require.Nil(t, r.Val())
})
@@ -322,7 +323,7 @@ assert(bit.band(1) == 1);
assert(bit.bxor(1,2) == 3);
assert(bit.bor(1,2,4,8,16,32,64,128) == 255)
`, []string{})
- require.EqualError(t, r.Err(), util.ErrRedisNil)
+ require.EqualError(t, r.Err(), redis.Nil.Error())
require.Nil(t, r.Val())
})
@@ -441,10 +442,10 @@ math.randomseed(ARGV[1]); return tostring(math.random())
})
t.Run("Make sure redis.log() works", func(t *testing.T) {
- require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_DEBUG, 'debug level');`, []string{}).Err(), util.ErrRedisNil)
- require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_VERBOSE, 'debug level');`, []string{}).Err(), util.ErrRedisNil)
- require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_NOTICE, 'debug level');`, []string{}).Err(), util.ErrRedisNil)
- require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_WARNING, 'debug level');`, []string{}).Err(), util.ErrRedisNil)
+ require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_DEBUG, 'debug level');`, []string{}).Err(), redis.Nil.Error())
+ require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_VERBOSE, 'debug level');`, []string{}).Err(), redis.Nil.Error())
+ require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_NOTICE, 'debug level');`, []string{}).Err(), redis.Nil.Error())
+ require.EqualError(t, rdb.Eval(ctx, `return redis.log(redis.LOG_WARNING, 'debug level');`, []string{}).Err(), redis.Nil.Error())
})
t.Run("EVAL_RO - successful case", func(t *testing.T) {
diff --git a/tests/gocase/util/constants.go b/tests/gocase/util/constants.go
index 9788796..087da2b 100644
--- a/tests/gocase/util/constants.go
+++ b/tests/gocase/util/constants.go
@@ -19,11 +19,12 @@
package util
+import "time"
+
const DefaultDelta = 0.000001
-const ErrRedisNil = "redis: nil"
// Kubernetes will send a SIGTERM signal to the containers in the pod after deleting the pod.
// It waits for a specified time, called the termination grace period. By default, this is 30 seconds.
// If the containers are still running after the grace period,
// they are sent the SIGKILL signal and forcibly removed.
-const k8sDefaultGracePeriod = 30
+const defaultGracePeriod = 30 * time.Second
diff --git a/tests/gocase/util/server.go b/tests/gocase/util/server.go
index 11bb69e..2aa3d37 100644
--- a/tests/gocase/util/server.go
+++ b/tests/gocase/util/server.go
@@ -69,7 +69,7 @@ func (s *KvrocksServer) NewTCPClient() *TCPClient {
func (s *KvrocksServer) Close() {
require.NoError(s.t, s.cmd.Process.Signal(syscall.SIGTERM))
- timer := time.AfterFunc(k8sDefaultGracePeriod*time.Second, func() {
+ timer := time.AfterFunc(defaultGracePeriod, func() {
require.NoError(s.t, s.cmd.Process.Kill())
})
defer timer.Stop()