Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Stop skipping Broker Tests #640

Merged
merged 2 commits into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions hack/set-span-id.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
diff --git a/vendor/go.opencensus.io/trace/trace.go b/vendor/go.opencensus.io/trace/trace.go
index 38ead7bf..9e6fe483 100644
index 38ead7bf..8793af0a 100644
--- a/vendor/go.opencensus.io/trace/trace.go
+++ b/vendor/go.opencensus.io/trace/trace.go
@@ -261,6 +261,11 @@ func startSpanInternal(name string, hasParent bool, parent SpanContext, remotePa
@@ -261,6 +261,13 @@ func startSpanInternal(name string, hasParent bool, parent SpanContext, remotePa
return span
}

+func (s *Span) SetSpanID(spanID SpanID) {
+ s.data.SpanID = spanID
+ if s.data != nil {
+ s.data.SpanID = spanID
+ }
+ s.spanContext.SpanID = spanID
+}
+
Expand Down
1 change: 0 additions & 1 deletion test/e2e/broker_channel_flow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ import (
)

func TestBrokerChannelFlow(t *testing.T) {
t.Skip("See issue: https://github.com/knative/eventing-contrib/issues/639")
helpers.BrokerChannelFlowTestHelper(t, channelTestRunner)
}
1 change: 0 additions & 1 deletion test/e2e/broker_event_transformation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ import (
)

func TestEventTransformationForTrigger(t *testing.T) {
t.Skip("See issue: https://github.com/knative/eventing-contrib/issues/639")
helpers.EventTransformationForTriggerTestHelper(t, channelTestRunner)
}
4 changes: 3 additions & 1 deletion vendor/go.opencensus.io/trace/trace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/knative.dev/eventing/pkg/tracing/traceparent.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func AddSpanFromTraceparentAttribute(ctx context.Context, name string, event clo
}
tps, ok := tp.(string)
if !ok {
return ctx, fmt.Errorf("extention attribute %q's value was not a string: %T", traceparentAttribute, tps)
return ctx, fmt.Errorf("extension attribute %q's value was not a string: %T", traceparentAttribute, tps)
}
sc, err := parseTraceparent(tps)
if err != nil {
Expand Down