From 7676d74179852a7fd46d2da8529f6cce8a3f2cc2 Mon Sep 17 00:00:00 2001 From: Andrey Slotin Date: Tue, 21 Jul 2020 16:57:58 +0200 Subject: [PATCH] Replace github.com/stretchr/testify with github.com/instana/testify --- acceptor/plugins_test.go | 2 +- adapters_test.go | 4 ++-- autoprofile/internal/allocation_sampler_test.go | 4 ++-- autoprofile/internal/block_sampler_test.go | 4 ++-- autoprofile/internal/cpu_sampler_test.go | 4 ++-- autoprofile/internal/profile_test.go | 2 +- autoprofile/internal/recorder_test.go | 2 +- autoprofile/internal/timer_test.go | 2 +- autoprofile/internal/uuid_test.go | 2 +- aws/ecs_metadata_test.go | 4 ++-- context_test.go | 4 ++-- eum_test.go | 2 +- event_internal_test.go | 2 +- fargate_agent_test.go | 4 ++-- go.mod | 2 +- go.sum | 10 ++++++---- instrumentation/instagrpc/client_test.go | 4 ++-- instrumentation/instagrpc/go.mod | 2 +- instrumentation/instagrpc/go.sum | 9 +++++++-- instrumentation/instagrpc/server_test.go | 4 ++-- instrumentation/instasarama/async_producer_test.go | 4 ++-- .../instasarama/consumer_group_handler_test.go | 4 ++-- instrumentation/instasarama/consumer_test.go | 4 ++-- instrumentation/instasarama/go.mod | 2 +- instrumentation/instasarama/go.sum | 7 +++++++ instrumentation/instasarama/partition_consumer_test.go | 4 ++-- instrumentation/instasarama/propagation_test.go | 4 ++-- instrumentation/instasarama/record_header_test.go | 4 ++-- instrumentation/instasarama/sync_producer_test.go | 4 ++-- instrumentation_http_test.go | 4 ++-- instrumentation_sql_go1.10_test.go | 4 ++-- instrumentation_sql_test.go | 4 ++-- json_span_test.go | 2 +- logger/logger_test.go | 4 ++-- options_test.go | 2 +- propagation_internal_test.go | 4 ++-- propagation_test.go | 4 ++-- recorder_test.go | 4 ++-- snapshot_test.go | 2 +- span_context_test.go | 2 +- span_test.go | 4 ++-- tracer_test.go | 2 +- util_internal_test.go | 4 ++-- w3ctrace/context_test.go | 4 ++-- w3ctrace/middleware_test.go | 4 ++-- w3ctrace/parent_test.go | 4 ++-- w3ctrace/state_test.go | 4 ++-- w3ctrace/version_test.go | 4 ++-- 48 files changed, 95 insertions(+), 81 deletions(-) diff --git a/acceptor/plugins_test.go b/acceptor/plugins_test.go index 52879eec8..51fa24007 100644 --- a/acceptor/plugins_test.go +++ b/acceptor/plugins_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/instana/go-sensor/acceptor" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) func TestNewECSTaskPluginPayload(t *testing.T) { diff --git a/adapters_test.go b/adapters_test.go index 4223dc062..fde248196 100644 --- a/adapters_test.go +++ b/adapters_test.go @@ -7,8 +7,8 @@ import ( instana "github.com/instana/go-sensor" ot "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) func TestWithTracingSpan(t *testing.T) { diff --git a/autoprofile/internal/allocation_sampler_test.go b/autoprofile/internal/allocation_sampler_test.go index 9c9d42f22..4f2fbf463 100644 --- a/autoprofile/internal/allocation_sampler_test.go +++ b/autoprofile/internal/allocation_sampler_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) var objs []string diff --git a/autoprofile/internal/block_sampler_test.go b/autoprofile/internal/block_sampler_test.go index 10e99c207..53323a57b 100644 --- a/autoprofile/internal/block_sampler_test.go +++ b/autoprofile/internal/block_sampler_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) func TestCreateBlockProfile(t *testing.T) { diff --git a/autoprofile/internal/cpu_sampler_test.go b/autoprofile/internal/cpu_sampler_test.go index 789488781..d145f57d4 100644 --- a/autoprofile/internal/cpu_sampler_test.go +++ b/autoprofile/internal/cpu_sampler_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) func TestCreateCPUProfile(t *testing.T) { diff --git a/autoprofile/internal/profile_test.go b/autoprofile/internal/profile_test.go index efbc4d08d..796150231 100644 --- a/autoprofile/internal/profile_test.go +++ b/autoprofile/internal/profile_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) func TestCallSite_Increment(t *testing.T) { diff --git a/autoprofile/internal/recorder_test.go b/autoprofile/internal/recorder_test.go index fcb29c1ec..307bdb7ca 100644 --- a/autoprofile/internal/recorder_test.go +++ b/autoprofile/internal/recorder_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) func TestRecorder_Flush(t *testing.T) { diff --git a/autoprofile/internal/timer_test.go b/autoprofile/internal/timer_test.go index fc8f1b98f..26aa52dc7 100644 --- a/autoprofile/internal/timer_test.go +++ b/autoprofile/internal/timer_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) func TestTimer_Restart(t *testing.T) { diff --git a/autoprofile/internal/uuid_test.go b/autoprofile/internal/uuid_test.go index 5dda77440..8680ff392 100644 --- a/autoprofile/internal/uuid_test.go +++ b/autoprofile/internal/uuid_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/instana/go-sensor/autoprofile/internal" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) func TestGenerateUUID_Unique(t *testing.T) { diff --git a/aws/ecs_metadata_test.go b/aws/ecs_metadata_test.go index 774c35c54..bfe4b0dcd 100644 --- a/aws/ecs_metadata_test.go +++ b/aws/ecs_metadata_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/instana/go-sensor/aws" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) func TestECSMetadataProvider_ContainerMetadata(t *testing.T) { diff --git a/context_test.go b/context_test.go index 401c62e4b..e078218ec 100644 --- a/context_test.go +++ b/context_test.go @@ -5,8 +5,8 @@ import ( "testing" instana "github.com/instana/go-sensor" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/instana/testify/assert" + "github.com/instana/testify/require" ) func TestSpanFromContext_WithActiveSpan(t *testing.T) { diff --git a/eum_test.go b/eum_test.go index 03d45e029..5fca5ae77 100644 --- a/eum_test.go +++ b/eum_test.go @@ -4,7 +4,7 @@ import ( "testing" instana "github.com/instana/go-sensor" - "github.com/stretchr/testify/assert" + "github.com/instana/testify/assert" ) const eumExpectedResult string = `