Stop skipping Broker Tests (#640)

* Update knative/eventing. * No longer skipping Broker tests.
knative · Oct 3, 2019 · 7bb12f8 · 7bb12f8
1 parent b1e74a1
commit 7bb12f8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/hack/set-span-id.patch b/hack/set-span-id.patch
@@ -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
 +}
 +

diff --git a/test/e2e/broker_channel_flow_test.go b/test/e2e/broker_channel_flow_test.go
@@ -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)
 }
diff --git a/test/e2e/broker_event_transformation_test.go b/test/e2e/broker_event_transformation_test.go
@@ -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)
 }
diff --git a/vendor/go.opencensus.io/trace/trace.go b/vendor/go.opencensus.io/trace/trace.go
diff --git a/vendor/knative.dev/eventing/pkg/tracing/traceparent.go b/vendor/knative.dev/eventing/pkg/tracing/traceparent.go
@@ -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 {