From af89ff74fa6048e583f59427d777345832eef07a Mon Sep 17 00:00:00 2001 From: skeris Date: Fri, 1 Dec 2023 20:49:50 +0300 Subject: [PATCH] mergeconflicts --- tests/integration/history_report_test.go | 2 +- tests/integration/set_account_verification_status_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/history_report_test.go b/tests/integration/history_report_test.go index 56ef4dd..2191d41 100644 --- a/tests/integration/history_report_test.go +++ b/tests/integration/history_report_test.go @@ -16,7 +16,7 @@ func TestHistoryReport(t *testing.T) { ctx := context.Background() jwtUtil := helpers.InitializeJWT() token, err := jwtUtil.Create("807f1f77bcf81cd799439077") - // t.Log("TOKEN:", token) + if ok := assert.NoError(t, err); !ok { return } diff --git a/tests/integration/set_account_verification_status_test.go b/tests/integration/set_account_verification_status_test.go index 787696c..6d26c29 100644 --- a/tests/integration/set_account_verification_status_test.go +++ b/tests/integration/set_account_verification_status_test.go @@ -12,7 +12,7 @@ import ( "penahub.gitlab.yandexcloud.net/pena-services/customer/tests/helpers" ) -var customerServiceBase string = os.Getenv("CUSTOMER_SERVICE") +var customerServiceBase = os.Getenv("CUSTOMER_SERVICE") func TestSetAccountVerificationStatusNO(t *testing.T) { jwtUtil := helpers.InitializeJWT()