update missed assertions

Author: brettlangdon

tests/contrib/pylons/test_pylons.py

@@ -174,7 +174,7 @@ def test_success_200(self, query_string=''):
 
         assert span.service == 'web'
         assert span.resource == 'root.index'
-        assert span.metrics.get(http.STATUS_CODE) == 200
+        assert_span_http_status_code(span, 200)
         if config.pylons.trace_query_string:
             assert span.meta.get(http.QUERY_STRING) == query_string
         else:
@@ -264,7 +264,7 @@ def test_template_render(self):
 
         assert request.service == 'web'
         assert request.resource == 'root.render'
-        assert request.metrics.get(http.STATUS_CODE) == 200
+        assert_span_http_status_code(request, 200)
         assert request.error == 0
 
         assert template.service == 'web'
@@ -284,7 +284,7 @@ def test_template_render_exception(self):
 
         assert request.service == 'web'
         assert request.resource == 'root.render_exception'
-        assert request.metrics.get(http.STATUS_CODE) == 500
+        assert_span_http_status_code(request, 500)
         assert request.error == 1
 
         assert template.service == 'web'
@@ -424,6 +424,6 @@ def test_success_200_ot(self):
 
         assert dd_span.service == 'web'
         assert dd_span.resource == 'root.index'
-        assert dd_span.metrics.get(http.STATUS_CODE) == 200
+        assert_span_http_status_code(dd_span, 200)
         assert dd_span.meta.get(http.URL) == 'http://localhost:80/'
         assert dd_span.error == 0

tests/contrib/pyramid/utils.py

@@ -14,6 +14,7 @@
 
 from ...opentracer.utils import init_tracer
 from ...base import BaseTracerTestCase
+from ...utils import assert_span_http_status_code
 
 
 class PyramidBase(BaseTracerTestCase):
@@ -65,7 +66,7 @@ def test_200(self, query_string=''):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 200
+        assert_span_http_status_code(s, 200)
         assert s.meta.get(http.URL) == 'http://localhost/'
         if config.pyramid.trace_query_string:
             assert s.meta.get(http.QUERY_STRING) == query_string
@@ -154,7 +155,7 @@ def test_404(self):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 404
+        assert_span_http_status_code(s, 404)
         assert s.meta.get(http.URL) == 'http://localhost/404'
 
     def test_302(self):
@@ -169,7 +170,7 @@ def test_302(self):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 302
+        assert_span_http_status_code(s, 302)
         assert s.meta.get(http.URL) == 'http://localhost/redirect'
 
     def test_204(self):
@@ -184,7 +185,7 @@ def test_204(self):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 204
+        assert_span_http_status_code(s, 204)
         assert s.meta.get(http.URL) == 'http://localhost/nocontent'
 
     def test_exception(self):
@@ -202,7 +203,7 @@ def test_exception(self):
         assert s.error == 1
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 500
+        assert_span_http_status_code(s, 500)
         assert s.meta.get(http.URL) == 'http://localhost/exception'
         assert s.meta.get('pyramid.route.name') == 'exception'
 
@@ -218,7 +219,7 @@ def test_500(self):
         assert s.error == 1
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 500
+        assert_span_http_status_code(s, 500)
         assert s.meta.get(http.URL) == 'http://localhost/error'
         assert s.meta.get('pyramid.route.name') == 'error'
         assert type(s.error) == int
@@ -238,7 +239,7 @@ def test_json(self):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 200
+        assert_span_http_status_code(s, 200)
         assert s.meta.get(http.URL) == 'http://localhost/json'
         assert s.meta.get('pyramid.route.name') == 'json'
 
@@ -262,7 +263,7 @@ def test_renderer(self):
         assert s.error == 0
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 200
+        assert_span_http_status_code(s, 200)
         assert s.meta.get(http.URL) == 'http://localhost/renderer'
         assert s.meta.get('pyramid.route.name') == 'renderer'
 
@@ -284,7 +285,7 @@ def test_http_exception_response(self):
         assert s.error == 1
         assert s.span_type == 'web'
         assert s.meta.get('http.method') == 'GET'
-        assert s.metrics.get('http.status_code') == 404
+        assert_span_http_status_code(s, 404)
         assert s.meta.get(http.URL) == 'http://localhost/404/raise_exception'
 
     def test_insert_tween_if_needed_already_set(self):
@@ -356,6 +357,6 @@ def test_200_ot(self):
         assert dd_span.error == 0
         assert dd_span.span_type == 'web'
         assert dd_span.meta.get('http.method') == 'GET'
-        assert dd_span.metrics.get('http.status_code') == 200
+        assert_span_http_status_code(dd_span, 200)
         assert dd_span.meta.get(http.URL) == 'http://localhost/'
         assert dd_span.meta.get('pyramid.route.name') == 'index'