From 4a499530eea41770cb791817ea7a614310cbf81f Mon Sep 17 00:00:00 2001 From: shatoboar Date: Fri, 20 May 2022 17:18:29 +0200 Subject: [PATCH] fix(system.GetInfo) changed all nil contexts to context.TODO() --- client/system/info_test.go | 3 ++- management/client/client_test.go | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/system/info_test.go b/client/system/info_test.go index eb49bfe95..cb2880873 100644 --- a/client/system/info_test.go +++ b/client/system/info_test.go @@ -1,13 +1,14 @@ package system import ( + "context" "testing" "github.com/stretchr/testify/assert" ) func Test_LocalVersion(t *testing.T) { - got := GetInfo(nil) + got := GetInfo(context.TODO()) want := "development" assert.Equal(t, want, got.WiretrusteeVersion) } diff --git a/management/client/client_test.go b/management/client/client_test.go index 2bb85f3b0..6c4ee9ea5 100644 --- a/management/client/client_test.go +++ b/management/client/client_test.go @@ -155,7 +155,8 @@ func TestClient_LoginUnregistered_ShouldThrow_401(t *testing.T) { if err != nil { t.Fatal(err) } - _, err = client.Login(*key, system.GetInfo(nil)) + + _, err = client.Login(*key, system.GetInfo(context.TODO())) if err == nil { t.Error("expecting err on unregistered login, got nil") } @@ -182,7 +183,7 @@ func TestClient_LoginRegistered(t *testing.T) { if err != nil { t.Error(err) } - info := system.GetInfo(nil) + info := system.GetInfo(context.TODO()) resp, err := client.Register(*key, ValidKey, "", info) if err != nil { t.Error(err) @@ -212,7 +213,7 @@ func TestClient_Sync(t *testing.T) { t.Error(err) } - info := system.GetInfo(nil) + info := system.GetInfo(context.TODO()) _, err = client.Register(*serverKey, ValidKey, "", info) if err != nil { t.Error(err) @@ -228,7 +229,7 @@ func TestClient_Sync(t *testing.T) { t.Fatal(err) } - info = system.GetInfo(nil) + info = system.GetInfo(context.TODO()) _, err = remoteClient.Register(*serverKey, ValidKey, "", info) if err != nil { t.Fatal(err) @@ -326,7 +327,7 @@ func Test_SystemMetaDataFromClient(t *testing.T) { }, nil } - info := system.GetInfo(nil) + info := system.GetInfo(context.TODO()) _, err = testClient.Register(*key, ValidKey, "", info) if err != nil { t.Errorf("error while trying to register client: %v", err)