diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..04edb177 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,56 @@ +# Python CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-python/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers` + - image: circleci/python:3.6.1 + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + - image: circleci/postgres:9.6.5-alpine-ram + - image: circleci/mysql:8.0.16 + - image: circleci/redis:5.0.4 + - image: rabbitmq:3.5.4 + + working_directory: ~/repo + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "requirements.txt" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: + name: install dependencies + command: | + python3 -m venv venv + . venv/bin/activate + pip install -U pip + python setup.py install_egg_info + pip install -r requirements.txt + pip install -r requirements-test.txt + + - save_cache: + paths: + - ./venv + key: v1-dependencies-{{ checksum "requirements.txt" }} + + - run: + name: run tests + command: | + . venv/bin/activate + python runtests.py + + - store_artifacts: + path: test-reports + destination: test-reports diff --git a/.travis.yml b/old.travis.yml similarity index 100% rename from .travis.yml rename to old.travis.yml diff --git a/tests/apps/app_aiohttp.py b/tests/apps/app_aiohttp.py index c1daaa3f..e2ffc9da 100644 --- a/tests/apps/app_aiohttp.py +++ b/tests/apps/app_aiohttp.py @@ -1,9 +1,13 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- import asyncio from aiohttp import web from ..helpers import testenv -testenv["aiohttp_server"] = "http://127.0.0.1:5002" + +testenv["aiohttp_port"] = 10810 +testenv["aiohttp_server"] = ("http://127.0.0.1:" + str(testenv["aiohttp_port"])) def say_hello(request): @@ -29,7 +33,7 @@ def run_server(): runner = web.AppRunner(app) loop.run_until_complete(runner.setup()) - site = web.TCPSite(runner, 'localhost', 5002) + site = web.TCPSite(runner, '127.0.0.1', testenv["aiohttp_port"]) loop.run_until_complete(site.start()) loop.run_forever() diff --git a/tests/apps/app_django.py b/tests/apps/app_django.py index 2f53fc6a..0998b0aa 100644 --- a/tests/apps/app_django.py +++ b/tests/apps/app_django.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- import os import sys import time diff --git a/tests/apps/flaskalino.py b/tests/apps/flaskalino.py index b1eed21a..9e04cd95 100644 --- a/tests/apps/flaskalino.py +++ b/tests/apps/flaskalino.py @@ -4,18 +4,20 @@ from flask import Flask, redirect from instana.wsgi import iWSGIMiddleware from wsgiref.simple_server import make_server -from instana.singletons import tracer +from instana.singletons import tracer from ..helpers import testenv -testenv["wsgi_server"] = "http://127.0.0.1:5000" + +testenv["wsgi_port"] = 10811 +testenv["wsgi_server"] = ("http://127.0.0.1:" + str(testenv["wsgi_port"])) app = Flask(__name__) app.debug = False app.use_reloader = False wsgi_app = iWSGIMiddleware(app.wsgi_app) -flask_server = make_server('127.0.0.1', 5000, wsgi_app) +flask_server = make_server('127.0.0.1', testenv["wsgi_port"], wsgi_app) @app.route("/") diff --git a/tests/apps/soapserver4132.py b/tests/apps/soapserver4132.py index 8911c65e..657e9409 100644 --- a/tests/apps/soapserver4132.py +++ b/tests/apps/soapserver4132.py @@ -1,24 +1,23 @@ -# vim: set fileencoding=UTF-8 : +#!/usr/bin/env python +# -*- coding: utf-8 -*- import logging from wsgiref.simple_server import make_server -from spyne import (Application, Fault, Integer, Iterable, ServiceBase, Unicode, - rpc) +from spyne import (Application, Fault, Integer, Iterable, ServiceBase, Unicode, rpc) from spyne.protocol.soap import Soap11 from spyne.server.wsgi import WsgiApplication from instana.wsgi import iWSGIMiddleware - from ..helpers import testenv -testenv["soap_server"] = "http://127.0.0.1:4132" + +testenv["soap_port"] = 10812 +testenv["soap_server"] = ("http://127.0.0.1:" + str(testenv["soap_port"])) # Simple in test suite SOAP server to test suds client instrumentation against. # Configured to listen on localhost port 4132 # WSDL: http://localhost:4232/?wsdl - - class StanSoapService(ServiceBase): @rpc(Unicode, Integer, _returns=Iterable(Unicode)) def ask_question(ctx, question, answer): @@ -59,7 +58,7 @@ def client_fault(ctx): # Use Instana middleware so we can test context passing and Soap server traces. wsgi_app = iWSGIMiddleware(WsgiApplication(app)) -soapserver = make_server('127.0.0.1', 4132, wsgi_app) +soapserver = make_server('127.0.0.1', testenv["soap_port"], wsgi_app) if __name__ == '__main__': soapserver.serve_forever() diff --git a/tests/apps/tornado.py b/tests/apps/tornado.py index eadd87a8..a567fbaf 100644 --- a/tests/apps/tornado.py +++ b/tests/apps/tornado.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- import os.path import tornado.auth import tornado.escape @@ -10,7 +12,9 @@ from ..helpers import testenv -testenv["tornado_server"] = "http://127.0.0.1:4133" + +testenv["tornado_port"] = 10813 +testenv["tornado_server"] = ("http://127.0.0.1:" + str(testenv["tornado_port"])) class Application(tornado.web.Application): @@ -68,5 +72,5 @@ def run_server(): asyncio.set_event_loop(loop) http_server = tornado.httpserver.HTTPServer(Application()) - http_server.listen(4133) + http_server.listen(testenv["tornado_port"]) tornado.ioloop.IOLoop.current().start() diff --git a/tests/helpers.py b/tests/helpers.py index 86fea93f..31243fb7 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -13,7 +13,7 @@ testenv['mysql_host'] = '127.0.0.1' testenv['mysql_port'] = int(os.environ.get('MYSQL_PORT', '3306')) -testenv['mysql_db'] = os.environ.get('MYSQL_DB', 'travis_ci_test') +testenv['mysql_db'] = os.environ.get('MYSQL_DB', 'circle_test') testenv['mysql_user'] = os.environ.get('MYSQL_USER', 'root') if 'MYSQL_PW' in os.environ: @@ -34,8 +34,8 @@ testenv['postgresql_host'] = '127.0.0.1' testenv['postgresql_port'] = int(os.environ.get('POSTGRESQL_PORT', '3306')) -testenv['postgresql_db'] = os.environ.get('POSTGRESQL_DB', 'travis_ci_test') -testenv['postgresql_user'] = os.environ.get('POSTGRESQL_USER', 'postgres') +testenv['postgresql_db'] = os.environ.get('POSTGRESQL_DB', 'circle_test') +testenv['postgresql_user'] = os.environ.get('POSTGRESQL_USER', 'root') if 'POSTGRESQL_PW' in os.environ: testenv['postgresql_pw'] = os.environ['POSTGRESQL_PW'] diff --git a/tests/test_aiohttp.py b/tests/test_aiohttp.py index 5098e616..3b59b3ff 100644 --- a/tests/test_aiohttp.py +++ b/tests/test_aiohttp.py @@ -10,6 +10,7 @@ class TestAiohttp(unittest.TestCase): + async def fetch(self, session, url, headers=None): try: async with session.get(url, headers=headers) as response: @@ -65,7 +66,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -121,7 +122,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/301", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/301", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -172,7 +173,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(405, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/405", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/405", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -224,7 +225,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(500, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/500", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/500", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual('INTERNAL SERVER ERROR', aiohttp_span.data.http.error) self.assertIsNotNone(aiohttp_span.stack) @@ -276,7 +277,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(504, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/504", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/504", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual('GATEWAY TIMEOUT', aiohttp_span.data.http.error) self.assertIsNotNone(aiohttp_span.stack) @@ -328,7 +329,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", aiohttp_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual("secret=", aiohttp_span.data.http.params) self.assertIsNotNone(aiohttp_span.stack) @@ -425,7 +426,7 @@ async def test(): self.assertEqual("aiohttp-server", aioserver_span.n) self.assertEqual(200, aioserver_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioserver_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioserver_span.data.http.url) self.assertEqual("GET", aioserver_span.data.http.method) self.assertIsNotNone(aioserver_span.stack) self.assertTrue(type(aioserver_span.stack) is list) @@ -433,7 +434,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(200, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioclient_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertIsNotNone(aioclient_span.stack) self.assertTrue(type(aioclient_span.stack) is list) @@ -484,7 +485,7 @@ async def test(): self.assertEqual("aiohttp-server", aioserver_span.n) self.assertEqual(200, aioserver_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioserver_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioserver_span.data.http.url) self.assertEqual("GET", aioserver_span.data.http.method) self.assertEqual("secret=", aioserver_span.data.http.params) self.assertIsNotNone(aioserver_span.stack) @@ -493,7 +494,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(200, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioclient_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertEqual("secret=", aioclient_span.data.http.params) self.assertIsNotNone(aioclient_span.stack) @@ -553,7 +554,7 @@ async def test(): self.assertEqual("aiohttp-server", aioserver_span.n) self.assertEqual(200, aioserver_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioserver_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioserver_span.data.http.url) self.assertEqual("GET", aioserver_span.data.http.method) self.assertEqual("secret=", aioserver_span.data.http.params) self.assertIsNotNone(aioserver_span.stack) @@ -562,7 +563,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(200, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/", aioclient_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertEqual("secret=", aioclient_span.data.http.params) self.assertIsNotNone(aioclient_span.stack) @@ -619,7 +620,7 @@ async def test(): self.assertEqual("aiohttp-server", aioserver_span.n) self.assertEqual(401, aioserver_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/401", aioserver_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/401", aioserver_span.data.http.url) self.assertEqual("GET", aioserver_span.data.http.method) self.assertIsNotNone(aioserver_span.stack) self.assertTrue(type(aioserver_span.stack) is list) @@ -627,7 +628,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(401, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/401", aioclient_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/401", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertIsNotNone(aioclient_span.stack) self.assertTrue(type(aioclient_span.stack) is list) @@ -678,7 +679,7 @@ async def test(): self.assertEqual("aiohttp-server", aioserver_span.n) self.assertEqual(500, aioserver_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/500", aioserver_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/500", aioserver_span.data.http.url) self.assertEqual("GET", aioserver_span.data.http.method) self.assertIsNotNone(aioserver_span.stack) self.assertTrue(type(aioserver_span.stack) is list) @@ -686,7 +687,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(500, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:5002/500", aioclient_span.data.http.url) + self.assertEqual(testenv["aiohttp_server"] + "/500", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertEqual('I must simulate errors.', aioclient_span.data.http.error) self.assertIsNotNone(aioclient_span.stack) diff --git a/tests/test_sudsjurko.py b/tests/test_sudsjurko.py index 7672899e..d8bbc936 100644 --- a/tests/test_sudsjurko.py +++ b/tests/test_sudsjurko.py @@ -5,11 +5,13 @@ from instana.singletons import tracer +from .helpers import testenv + class TestSudsJurko: def setUp(self): """ Clear all spans before a test run """ - self.client = Client('http://localhost:4132/?wsdl', cache=None) + self.client = Client(testenv["soap_server"] + '/?wsdl', cache=None) self.recorder = tracer.recorder self.recorder.clear_spans() tracer.cur_ctx = None @@ -53,7 +55,7 @@ def test_basic_request(self): assert_equals(None, soap_span.ec) assert_equals('ask_question', soap_span.data.soap.action) - assert_equals('http://localhost:4132/', soap_span.data.http.url) + assert_equals(testenv["soap_server"] + '/', soap_span.data.http.url) def test_server_exception(self): response = None @@ -90,7 +92,7 @@ def test_server_exception(self): soap_span.data.custom.logs[tskey]['message']) assert_equals('server_exception', soap_span.data.soap.action) - assert_equals('http://localhost:4132/', soap_span.data.http.url) + assert_equals(testenv["soap_server"] + '/', soap_span.data.http.url) def test_server_fault(self): response = None @@ -126,7 +128,7 @@ def test_server_fault(self): soap_span.data.custom.logs[tskey]['message']) assert_equals('server_fault', soap_span.data.soap.action) - assert_equals('http://localhost:4132/', soap_span.data.http.url) + assert_equals(testenv["soap_server"] + '/', soap_span.data.http.url) def test_client_fault(self): response = None @@ -163,4 +165,4 @@ def test_client_fault(self): soap_span.data.custom.logs[tskey]['message']) assert_equals('client_fault', soap_span.data.soap.action) - assert_equals('http://localhost:4132/', soap_span.data.http.url) + assert_equals(testenv["soap_server"] + '/', soap_span.data.http.url) diff --git a/tests/test_tornado_client.py b/tests/test_tornado_client.py index e8a31c75..c895dfa9 100644 --- a/tests/test_tornado_client.py +++ b/tests/test_tornado_client.py @@ -68,7 +68,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(200, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -77,7 +77,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(200, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", client_span.data.http.url) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -128,7 +128,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(200, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("POST", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -137,7 +137,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(200, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", client_span.data.http.url) self.assertEqual("POST", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -192,7 +192,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(200, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -201,7 +201,7 @@ async def test(): self.assertEqual("tornado-server", server301_span.n) self.assertEqual(301, server301_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/301", server301_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/301", server301_span.data.http.url) self.assertIsNone(server301_span.data.http.params) self.assertEqual("GET", server301_span.data.http.method) self.assertIsNotNone(server301_span.stack) @@ -210,7 +210,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(200, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/301", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/301", client_span.data.http.url) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -264,7 +264,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(405, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/405", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/405", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -273,7 +273,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(405, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/405", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/405", client_span.data.http.url) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -327,7 +327,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(500, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/500", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/500", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -336,7 +336,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(500, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/500", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/500", client_span.data.http.url) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -390,7 +390,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(504, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/504", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/504", server_span.data.http.url) self.assertIsNone(server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -399,7 +399,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(504, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/504", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/504", client_span.data.http.url) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) self.assertTrue(type(client_span.stack) is list) @@ -450,7 +450,7 @@ async def test(): self.assertEqual("tornado-server", server_span.n) self.assertEqual(200, server_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", server_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", server_span.data.http.url) self.assertEqual('secret=', server_span.data.http.params) self.assertEqual("GET", server_span.data.http.method) self.assertIsNotNone(server_span.stack) @@ -459,7 +459,7 @@ async def test(): self.assertEqual("tornado-client", client_span.n) self.assertEqual(200, client_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", client_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", client_span.data.http.url) self.assertEqual('secret=', client_span.data.http.params) self.assertEqual("GET", client_span.data.http.method) self.assertIsNotNone(client_span.stack) diff --git a/tests/test_tornado_server.py b/tests/test_tornado_server.py index 6678b8c0..9053844e 100644 --- a/tests/test_tornado_server.py +++ b/tests/test_tornado_server.py @@ -78,7 +78,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(200, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", tornado_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -87,7 +87,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -138,7 +138,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(200, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", tornado_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("POST", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -147,7 +147,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", aiohttp_span.data.http.url) self.assertEqual("POST", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -203,7 +203,7 @@ async def test(): self.assertEqual("tornado-server", tornado_301_span.n) self.assertEqual(301, tornado_301_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/301", tornado_301_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/301", tornado_301_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("GET", tornado_301_span.data.http.method) self.assertIsNotNone(tornado_301_span.stack) @@ -212,7 +212,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(200, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", tornado_span.data.http.url) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) self.assertTrue(type(tornado_span.stack) is list) @@ -220,7 +220,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/301", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/301", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -271,7 +271,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(405, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/405", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/405", tornado_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -280,7 +280,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(405, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/405", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/405", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertIsNotNone(aiohttp_span.stack) self.assertTrue(type(aiohttp_span.stack) is list) @@ -331,7 +331,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(500, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/500", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/500", tornado_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -340,7 +340,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(500, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/500", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/500", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual('Internal Server Error', aiohttp_span.data.http.error) self.assertIsNotNone(aiohttp_span.stack) @@ -392,7 +392,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(504, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/504", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/504", tornado_span.data.http.url) self.assertIsNone(tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -401,7 +401,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(504, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/504", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/504", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual('Gateway Timeout', aiohttp_span.data.http.error) self.assertIsNotNone(aiohttp_span.stack) @@ -453,7 +453,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(200, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", tornado_span.data.http.url) self.assertEqual("secret=", tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -462,7 +462,7 @@ async def test(): self.assertEqual("aiohttp-client", aiohttp_span.n) self.assertEqual(200, aiohttp_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", aiohttp_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", aiohttp_span.data.http.url) self.assertEqual("GET", aiohttp_span.data.http.method) self.assertEqual("secret=", aiohttp_span.data.http.params) self.assertIsNotNone(aiohttp_span.stack) @@ -521,7 +521,7 @@ async def test(): self.assertEqual("tornado-server", tornado_span.n) self.assertEqual(200, tornado_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", tornado_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", tornado_span.data.http.url) self.assertEqual("secret=", tornado_span.data.http.params) self.assertEqual("GET", tornado_span.data.http.method) self.assertIsNotNone(tornado_span.stack) @@ -530,7 +530,7 @@ async def test(): self.assertEqual("aiohttp-client", aioclient_span.n) self.assertEqual(200, aioclient_span.data.http.status) - self.assertEqual("http://127.0.0.1:4133/", aioclient_span.data.http.url) + self.assertEqual(testenv["tornado_server"] + "/", aioclient_span.data.http.url) self.assertEqual("GET", aioclient_span.data.http.method) self.assertEqual("secret=", aioclient_span.data.http.params) self.assertIsNotNone(aioclient_span.stack) diff --git a/tests/test_urllib3.py b/tests/test_urllib3.py index 76254336..fefeaf6b 100644 --- a/tests/test_urllib3.py +++ b/tests/test_urllib3.py @@ -6,6 +6,7 @@ import urllib3 from instana.singletons import tracer +from .helpers import testenv class TestUrllib3(unittest.TestCase): @@ -20,7 +21,7 @@ def tearDown(self): return None def test_vanilla_requests(self): - r = self.http.request('GET', 'http://127.0.0.1:5000/') + r = self.http.request('GET', testenv["wsgi_server"] + '/') self.assertEqual(r.status, 200) spans = self.recorder.queued_spans() @@ -28,7 +29,7 @@ def test_vanilla_requests(self): def test_get_request(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/') + r = self.http.request('GET', testenv["wsgi_server"] + '/') spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -59,7 +60,7 @@ def test_get_request(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -71,7 +72,7 @@ def test_get_request(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(200, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span.data.http.url) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) @@ -79,7 +80,7 @@ def test_get_request(self): def test_get_request_with_query(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/?one=1&two=2') + r = self.http.request('GET', testenv["wsgi_server"] + '/?one=1&two=2') spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -110,7 +111,7 @@ def test_get_request_with_query(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -122,7 +123,7 @@ def test_get_request_with_query(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(200, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span.data.http.url) self.assertTrue(urllib3_span.data.http.params in ["one=1&two=2", "two=2&one=1"] ) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) @@ -131,7 +132,7 @@ def test_get_request_with_query(self): def test_get_request_with_alt_query(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/', fields={'one': '1', 'two': 2}) + r = self.http.request('GET', testenv["wsgi_server"] + '/', fields={'one': '1', 'two': 2}) spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -162,7 +163,7 @@ def test_get_request_with_alt_query(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -174,7 +175,7 @@ def test_get_request_with_alt_query(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(200, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span.data.http.url) self.assertTrue(urllib3_span.data.http.params in ["one=1&two=2", "two=2&one=1"] ) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) @@ -183,7 +184,7 @@ def test_get_request_with_alt_query(self): def test_put_request(self): with tracer.start_active_span('test'): - r = self.http.request('PUT', 'http://127.0.0.1:5000/notfound') + r = self.http.request('PUT', testenv["wsgi_server"] + '/notfound') spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -214,7 +215,7 @@ def test_put_request(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/notfound', wsgi_span.data.http.url) self.assertEqual('PUT', wsgi_span.data.http.method) self.assertEqual('404', wsgi_span.data.http.status) @@ -226,7 +227,7 @@ def test_put_request(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(404, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/notfound", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/notfound", urllib3_span.data.http.url) self.assertEqual("PUT", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) @@ -234,7 +235,7 @@ def test_put_request(self): def test_301_redirect(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/301') + r = self.http.request('GET', testenv["wsgi_server"] + '/301') spans = self.recorder.queued_spans() self.assertEqual(5, len(spans)) @@ -276,7 +277,7 @@ def test_301_redirect(self): # wsgi self.assertEqual("wsgi", wsgi_span1.n) - self.assertEqual('127.0.0.1:5000', wsgi_span1.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span1.data.http.host) self.assertEqual('/', wsgi_span1.data.http.url) self.assertEqual('GET', wsgi_span1.data.http.method) self.assertEqual('200', wsgi_span1.data.http.status) @@ -285,7 +286,7 @@ def test_301_redirect(self): self.assertEqual(2, len(wsgi_span1.stack)) self.assertEqual("wsgi", wsgi_span2.n) - self.assertEqual('127.0.0.1:5000', wsgi_span2.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span2.data.http.host) self.assertEqual('/301', wsgi_span2.data.http.url) self.assertEqual('GET', wsgi_span2.data.http.method) self.assertEqual('301', wsgi_span2.data.http.status) @@ -297,7 +298,7 @@ def test_301_redirect(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span1.n) self.assertEqual(200, urllib3_span1.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span1.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span1.data.http.url) self.assertEqual("GET", urllib3_span1.data.http.method) self.assertIsNotNone(urllib3_span1.stack) self.assertTrue(type(urllib3_span1.stack) is list) @@ -305,7 +306,7 @@ def test_301_redirect(self): self.assertEqual("urllib3", urllib3_span2.n) self.assertEqual(301, urllib3_span2.data.http.status) - self.assertEqual("http://127.0.0.1:5000/301", urllib3_span2.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/301", urllib3_span2.data.http.url) self.assertEqual("GET", urllib3_span2.data.http.method) self.assertIsNotNone(urllib3_span2.stack) self.assertTrue(type(urllib3_span2.stack) is list) @@ -313,7 +314,7 @@ def test_301_redirect(self): def test_302_redirect(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/302') + r = self.http.request('GET', testenv["wsgi_server"] + '/302') spans = self.recorder.queued_spans() self.assertEqual(5, len(spans)) @@ -355,7 +356,7 @@ def test_302_redirect(self): # wsgi self.assertEqual("wsgi", wsgi_span1.n) - self.assertEqual('127.0.0.1:5000', wsgi_span1.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span1.data.http.host) self.assertEqual('/', wsgi_span1.data.http.url) self.assertEqual('GET', wsgi_span1.data.http.method) self.assertEqual('200', wsgi_span1.data.http.status) @@ -364,7 +365,7 @@ def test_302_redirect(self): self.assertEqual(2, len(wsgi_span1.stack)) self.assertEqual("wsgi", wsgi_span2.n) - self.assertEqual('127.0.0.1:5000', wsgi_span2.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span2.data.http.host) self.assertEqual('/302', wsgi_span2.data.http.url) self.assertEqual('GET', wsgi_span2.data.http.method) self.assertEqual('302', wsgi_span2.data.http.status) @@ -376,7 +377,7 @@ def test_302_redirect(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span1.n) self.assertEqual(200, urllib3_span1.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span1.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span1.data.http.url) self.assertEqual("GET", urllib3_span1.data.http.method) self.assertIsNotNone(urllib3_span1.stack) self.assertTrue(type(urllib3_span1.stack) is list) @@ -384,7 +385,7 @@ def test_302_redirect(self): self.assertEqual("urllib3", urllib3_span2.n) self.assertEqual(302, urllib3_span2.data.http.status) - self.assertEqual("http://127.0.0.1:5000/302", urllib3_span2.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/302", urllib3_span2.data.http.url) self.assertEqual("GET", urllib3_span2.data.http.method) self.assertIsNotNone(urllib3_span2.stack) self.assertTrue(type(urllib3_span2.stack) is list) @@ -392,7 +393,7 @@ def test_302_redirect(self): def test_5xx_request(self): with tracer.start_active_span('test'): - r = self.http.request('GET', 'http://127.0.0.1:5000/504') + r = self.http.request('GET', testenv["wsgi_server"] + '/504') spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -424,7 +425,7 @@ def test_5xx_request(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/504', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('504', wsgi_span.data.http.status) @@ -436,7 +437,7 @@ def test_5xx_request(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(504, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/504", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/504", urllib3_span.data.http.url) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) @@ -445,7 +446,7 @@ def test_5xx_request(self): def test_exception_logging(self): with tracer.start_active_span('test'): try: - r = self.http.request('GET', 'http://127.0.0.1:5000/exception') + r = self.http.request('GET', testenv["wsgi_server"] + '/exception') except Exception: pass @@ -489,7 +490,7 @@ def test_exception_logging(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/exception', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('500', wsgi_span.data.http.status) @@ -501,7 +502,7 @@ def test_exception_logging(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(500, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/exception", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/exception", urllib3_span.data.http.url) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) @@ -549,7 +550,7 @@ def test_client_error(self): def test_requestspkg_get(self): with tracer.start_active_span('test'): - r = requests.get('http://127.0.0.1:5000/', timeout=2) + r = requests.get(testenv["wsgi_server"] + '/', timeout=2) spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -580,7 +581,7 @@ def test_requestspkg_get(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -592,7 +593,7 @@ def test_requestspkg_get(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(200, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/", urllib3_span.data.http.url) self.assertEqual("GET", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) @@ -600,7 +601,7 @@ def test_requestspkg_get(self): def test_requestspkg_put(self): with tracer.start_active_span('test'): - r = requests.put('http://127.0.0.1:5000/notfound') + r = requests.put(testenv["wsgi_server"] + '/notfound') spans = self.recorder.queued_spans() self.assertEqual(3, len(spans)) @@ -630,7 +631,7 @@ def test_requestspkg_put(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv["wsgi_port"]), wsgi_span.data.http.host) self.assertEqual('/notfound', wsgi_span.data.http.url) self.assertEqual('PUT', wsgi_span.data.http.method) self.assertEqual('404', wsgi_span.data.http.status) @@ -642,7 +643,7 @@ def test_requestspkg_put(self): self.assertEqual("test", test_span.data.sdk.name) self.assertEqual("urllib3", urllib3_span.n) self.assertEqual(404, urllib3_span.data.http.status) - self.assertEqual("http://127.0.0.1:5000/notfound", urllib3_span.data.http.url) + self.assertEqual(testenv["wsgi_server"] + "/notfound", urllib3_span.data.http.url) self.assertEqual("PUT", urllib3_span.data.http.method) self.assertIsNotNone(urllib3_span.stack) self.assertTrue(type(urllib3_span.stack) is list) diff --git a/tests/test_wsgi.py b/tests/test_wsgi.py index 79ca0b66..fc6f2aee 100644 --- a/tests/test_wsgi.py +++ b/tests/test_wsgi.py @@ -5,6 +5,7 @@ import urllib3 from instana.singletons import agent, tracer +from .helpers import testenv class TestWSGI(unittest.TestCase): @@ -20,7 +21,7 @@ def tearDown(self): return None def test_vanilla_requests(self): - response = self.http.request('GET', 'http://127.0.0.1:5000/') + response = self.http.request('GET', testenv["wsgi_server"] + '/') spans = self.recorder.queued_spans() self.assertEqual(1, len(spans)) @@ -29,7 +30,7 @@ def test_vanilla_requests(self): def test_get_request(self): with tracer.start_active_span('test'): - response = self.http.request('GET', 'http://127.0.0.1:5000/') + response = self.http.request('GET', testenv["wsgi_server"] + '/') spans = self.recorder.queued_spans() @@ -76,7 +77,7 @@ def test_get_request(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv['wsgi_port']), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -86,7 +87,7 @@ def test_get_request(self): def test_complex_request(self): with tracer.start_active_span('test'): - response = self.http.request('GET', 'http://127.0.0.1:5000/complex') + response = self.http.request('GET', testenv["wsgi_server"] + '/complex') spans = self.recorder.queued_spans() self.assertEqual(5, len(spans)) @@ -143,7 +144,7 @@ def test_complex_request(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv['wsgi_port']), wsgi_span.data.http.host) self.assertEqual('/complex', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -160,7 +161,7 @@ def test_custom_header_capture(self): request_headers['X-Capture-That'] = 'that' with tracer.start_active_span('test'): - response = self.http.request('GET', 'http://127.0.0.1:5000/', headers=request_headers) + response = self.http.request('GET', testenv["wsgi_server"] + '/', headers=request_headers) spans = self.recorder.queued_spans() @@ -207,7 +208,7 @@ def test_custom_header_capture(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv['wsgi_port']), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('GET', wsgi_span.data.http.method) self.assertEqual('200', wsgi_span.data.http.status) @@ -222,7 +223,7 @@ def test_custom_header_capture(self): def test_secret_scrubbing(self): with tracer.start_active_span('test'): - response = self.http.request('GET', 'http://127.0.0.1:5000/?secret=shhh') + response = self.http.request('GET', testenv["wsgi_server"] + '/?secret=shhh') spans = self.recorder.queued_spans() @@ -269,7 +270,7 @@ def test_secret_scrubbing(self): # wsgi self.assertEqual("wsgi", wsgi_span.n) - self.assertEqual('127.0.0.1:5000', wsgi_span.data.http.host) + self.assertEqual('127.0.0.1:' + str(testenv['wsgi_port']), wsgi_span.data.http.host) self.assertEqual('/', wsgi_span.data.http.url) self.assertEqual('secret=', wsgi_span.data.http.params) self.assertEqual('GET', wsgi_span.data.http.method) @@ -283,7 +284,7 @@ def test_with_incoming_context(self): request_headers['X-Instana-T'] = '0000000000000001' request_headers['X-Instana-S'] = '0000000000000001' - response = self.http.request('GET', 'http://127.0.0.1:5000/', headers=request_headers) + response = self.http.request('GET', testenv["wsgi_server"] + '/', headers=request_headers) assert response self.assertEqual(200, response.status) @@ -316,7 +317,7 @@ def test_with_incoming_mixed_case_context(self): request_headers['X-InSTANa-T'] = '0000000000000001' request_headers['X-instana-S'] = '0000000000000001' - response = self.http.request('GET', 'http://127.0.0.1:5000/', headers=request_headers) + response = self.http.request('GET', testenv["wsgi_server"] + '/', headers=request_headers) assert response self.assertEqual(200, response.status) @@ -346,7 +347,7 @@ def test_with_incoming_mixed_case_context(self): def test_response_headers(self): with tracer.start_active_span('test'): - response = self.http.request('GET', 'http://127.0.0.1:5000/') + response = self.http.request('GET', testenv["wsgi_server"] + '/') spans = self.recorder.queued_spans()