fix some tests

Author: beniwohli

elasticapm/instrumentation/packages/urllib.py

@@ -98,9 +98,10 @@ def call(self, module, method, wrapped, instance, args, kwargs):
             self._set_disttracing_headers(request_object, trace_parent, transaction)
             response = wrapped(*args, **kwargs)
             if response:
+                status = getattr(response, "status", None) or response.getcode()  # Python 2 compat
                 if span.context:
-                    span.context["http"]["status_code"] = response.status
-                span.set_success() if response.status < 400 else span.set_failure()
+                    span.context["http"]["status_code"] = status
+                span.set_success() if status < 400 else span.set_failure()
             return response
 
     def mutate_unsampled_call_args(self, module, method, wrapped, instance, args, kwargs, transaction):

tests/instrumentation/asyncio/aiohttp_client_tests.py

@@ -62,7 +62,7 @@ async def test_http_get(instrument, event_loop, elasticapm_client, waiting_https
     assert span["subtype"] == "http"
     assert span["sync"] is False
     assert span["context"]["http"]["url"] == waiting_httpserver.url
-    assert span["context"]["http"]["status_code"] == 200
+    assert span["context"]["http"]["status_code"] == 204
     assert spans[0]["context"]["destination"]["service"] == {
         "name": "http://127.0.0.1:%d" % waiting_httpserver.server_address[1],
         "resource": "127.0.0.1:%d" % waiting_httpserver.server_address[1],

tests/instrumentation/urllib_tests.py

@@ -45,7 +45,7 @@
     getresponse_method = "http.client.HTTPConnection.getresponse"
 except ImportError:
     from urllib2 import urlopen
-    from urllib2 import URLError
+    from urllib2 import URLError, HTTPError
 
     request_method = "httplib.HTTPConnection.request"
     getresponse_method = "httplib.HTTPConnection.getresponse"