bump cross test timeouts to 10 seconds (#46)

* bump ruby command timeouts to 10 seconds * use longer timeout to test duration
kolide · Jan 7, 2025 · cb25b5e · cb25b5e
1 parent 46a8d5c
commit cb25b5e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/cross_language_tests/boxer_cross_test.go b/cross_language_tests/boxer_cross_test.go
@@ -18,6 +18,8 @@ import (
 	"github.com/vmihailenco/msgpack/v5"
 )
 
+const rubyCmdTimeout = 10 * time.Second
+
 type boxerCrossTestCase struct {
 	Key          []byte
 	Counterparty []byte
@@ -95,7 +97,7 @@ func TestBoxerRuby(t *testing.T) {
 				//#nosec G306 -- Need readable files
 				require.NoError(t, os.WriteFile(rubyInFile, []byte(base64.StdEncoding.EncodeToString(b)), 0644))
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				cmd := exec.CommandContext(ctx, "ruby", boxerRB, "encode", rubyInFile, rubyOutFile)
@@ -204,7 +206,7 @@ func TestBoxerRuby(t *testing.T) {
 					//#nosec G306 -- Need readable files
 					require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644))
 
-					ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+					ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 					defer cancel()
 
 					//#nosec G204 -- No taint on hardcoded input
@@ -253,7 +255,7 @@ func TestBoxerRuby(t *testing.T) {
 				//#nosec G306 -- Need readable files
 				require.NoError(t, os.WriteFile(rubyInFile, []byte(base64.StdEncoding.EncodeToString(b)), 0644))
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				cmd := exec.CommandContext(ctx, "ruby", boxerRB, "sign", rubyInFile, rubyOutFile)
@@ -377,7 +379,7 @@ func TestBoxerMaxSize(t *testing.T) {
 				//#nosec G306 -- Need readable files
 				require.NoError(t, os.WriteFile(testfile, []byte(base64.StdEncoding.EncodeToString(b)), 0644))
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				//#nosec G204 -- No taint on hardcoded input

diff --git a/cross_language_tests/challenge_cross_test.go b/cross_language_tests/challenge_cross_test.go
@@ -139,7 +139,7 @@ func TestChallenge_RubyGenerate_GoRespondPng(t *testing.T) {
 
 			require.Equal(t, challengeData, innerResponse.ChallengeData)
 			require.Equal(t, responderData, innerResponse.ResponseData)
-			require.WithinDuration(t, time.Now(), time.Unix(innerResponse.Timestamp, 0), time.Second*5)
+			require.WithinDuration(t, time.Now(), time.Unix(innerResponse.Timestamp, 0), rubyCmdTimeout)
 		})
 	}
 }

diff --git a/cross_language_tests/png_cross_test.go b/cross_language_tests/png_cross_test.go
@@ -8,7 +8,6 @@ import (
 	"path"
 	"runtime"
 	"testing"
-	"time"
 
 	"github.com/kolide/kit/ulid"
 	"github.com/kolide/krypto"
@@ -64,7 +63,7 @@ func TestPngRuby(t *testing.T) {
 						t.Skip("skip png decode test on windows because ruby library chunky_png is looking for CRLF png signature")
 					}
 
-					ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+					ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 					defer cancel()
 
 					resultFile := path.Join(dir, ulid.New()+".dat")

diff --git a/cross_language_tests/rsa_cross_test.go b/cross_language_tests/rsa_cross_test.go
@@ -8,7 +8,6 @@ import (
 	"os/exec"
 	"path"
 	"testing"
-	"time"
 
 	"github.com/kolide/krypto"
 	"github.com/stretchr/testify/require"
@@ -59,7 +58,7 @@ func TestRsaRuby(t *testing.T) {
 				t.Parallel()
 				tt := tt
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				dir := t.TempDir()
@@ -90,7 +89,7 @@ func TestRsaRuby(t *testing.T) {
 				t.Parallel()
 				tt := tt
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				dir := t.TempDir()
@@ -119,7 +118,7 @@ func TestRsaRuby(t *testing.T) {
 				t.Parallel()
 				tt := tt
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				dir := t.TempDir()
@@ -151,7 +150,7 @@ func TestRsaRuby(t *testing.T) {
 				t.Parallel()
 				tt := tt
 
-				ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), rubyCmdTimeout)
 				defer cancel()
 
 				dir := t.TempDir()

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kolide/krypto
 
-go 1.22
+go 1.22.0
 
 require (
 	github.com/kolide/kit v0.0.0-20221107170827-fb85e3d59eab