From 7ee8a1f5d9ad026605ed11686f3eee1b94bbe0d2 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Mon, 30 Aug 2021 05:27:53 +0530 Subject: [PATCH] update contrib sha --- .github/workflows/test.yml | 2 +- tests/util/src/opentelemetry/test/test_base.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b039a41b78f..1b88af5955c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: 3ad534cbba41c2b92618f5f03c4c92cee4a72df6 + CONTRIB_REPO_SHA: 71b0ca7d80a2c717bdee12c11ede6d803ac980df jobs: build: diff --git a/tests/util/src/opentelemetry/test/test_base.py b/tests/util/src/opentelemetry/test/test_base.py index 6596e78a577..b778fce64eb 100644 --- a/tests/util/src/opentelemetry/test/test_base.py +++ b/tests/util/src/opentelemetry/test/test_base.py @@ -49,11 +49,11 @@ def get_finished_spans(self): self, self.memory_exporter.get_finished_spans() ) - def assertSpanInstrumentationInfo(self, span, module): + def assertSpanInstrumentationInfo(self, span, module): # pylint: disable=C0103 self.assertEqual(span.instrumentation_info.name, module.__name__) self.assertEqual(span.instrumentation_info.version, module.__version__) - def assertSpanHasAttributes(self, span, attributes): + def assertSpanHasAttributes(self, span, attributes): # pylint: disable=C0103 for key, val in attributes.items(): self.assertIn(key, span.attributes) self.assertEqual(val, span.attributes[key]) @@ -112,9 +112,11 @@ def by_name(self, name): if span.name == name: return span self.test.fail("Did not find span with name {}".format(name)) + return None def by_attr(self, key, value): for span in self: if span.attributes.get(key) == value: return span self.test.fail("Did not find span with attrs {}={}".format(key, value)) + return None