From 6a373312c3153ea1a6fd198b02341dd41ba81fd3 Mon Sep 17 00:00:00 2001 From: Marco Munizaga Date: Wed, 25 Jan 2023 15:52:41 -0800 Subject: [PATCH] feat: ci test-plans: Parse test timeout parameter for interop test (#2014) * Parse test timeout parameter for interop test * Update test-plans/cmd/ping/main.go Co-authored-by: Marten Seemann Co-authored-by: Marten Seemann --- test-plans/cmd/ping/main.go | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/test-plans/cmd/ping/main.go b/test-plans/cmd/ping/main.go index acedee4f08..d0432421ee 100644 --- a/test-plans/cmd/ping/main.go +++ b/test-plans/cmd/ping/main.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "os" + "strconv" "time" "github.com/go-redis/redis/v8" @@ -24,24 +25,33 @@ import ( func main() { var ( - transport = os.Getenv("transport") - secureChannel = os.Getenv("security") - muxer = os.Getenv("muxer") - isDialerStr = os.Getenv("is_dialer") - ip = os.Getenv("ip") - redisAddr = os.Getenv("REDIS_ADDR") + transport = os.Getenv("transport") + secureChannel = os.Getenv("security") + muxer = os.Getenv("muxer") + isDialerStr = os.Getenv("is_dialer") + ip = os.Getenv("ip") + testTimeoutStr = os.Getenv("test_timeout") + redisAddr = os.Getenv("REDIS_ADDR") ) + testTimeout := 10 * time.Second + if testTimeoutStr != "" { + secs, err := strconv.ParseInt(testTimeoutStr, 10, 32) + if err == nil { + testTimeout = time.Duration(secs) * time.Second + } + } + if redisAddr == "" { redisAddr = "redis:6379" } - ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), testTimeout) defer cancel() // Get peer information via redis rClient := redis.NewClient(&redis.Options{ - DialTimeout: 10 * time.Second, + DialTimeout: testTimeout, Addr: redisAddr, Password: "", DB: 0, @@ -110,7 +120,7 @@ func main() { fmt.Println("My multiaddr is: ", host.Addrs()) if isDialer { - val, err := rClient.BLPop(ctx, 20*time.Second, "listenerAddr").Result() + val, err := rClient.BLPop(ctx, testTimeout, "listenerAddr").Result() if err != nil { log.Fatal("Failed to wait for listener to be ready") } @@ -144,7 +154,7 @@ func main() { if err != nil { log.Fatal("Failed to send listener address") } - _, err = rClient.BLPop(ctx, 20*time.Second, "dialerDone").Result() + _, err = rClient.BLPop(ctx, testTimeout, "dialerDone").Result() if err != nil { log.Fatal("Failed to wait for dialer conclusion") }