[pyramid] add testing for version 1.9

Author: Emanuele Palazzetti

.circleci/config.yml

@@ -449,8 +449,8 @@ jobs:
       - restore_cache:
           keys:
               - tox-cache-pyramid-{{ checksum "tox.ini" }}
-      - run: tox -e '{py27,py34,py35,py36}-pyramid{17,18}-webtest' --result-json /tmp/pyramid.1.results
-      - run: tox -e '{py27,py34,py35,py36}-pyramid-autopatch{17,18}-webtest' --result-json /tmp/pyramid.2.results
+      - run: tox -e '{py27,py34,py35,py36}-pyramid{17,18,19}-webtest' --result-json /tmp/pyramid.1.results
+      - run: tox -e '{py27,py34,py35,py36}-pyramid-autopatch{17,18,19}-webtest' --result-json /tmp/pyramid.2.results
       - persist_to_workspace:
           root: /tmp
           paths:

tests/contrib/pyramid/test_pyramid_autopatch.py

@@ -1,20 +1,23 @@
 # stdlib
-import logging
 import sys
 import webtest
+import ddtrace
+
 from nose.tools import eq_
 from pyramid.config import Configurator
 
 # 3p
 from wsgiref.simple_server import make_server
 
 # project
-import ddtrace
+from ...test_tracer import get_dummy_tracer
+from ...util import override_global_tracer
+
 from .test_pyramid import PyramidBase, get_app, custom_exception_view
 
+
 class TestPyramidAutopatch(PyramidBase):
     def setUp(self):
-        from tests.test_tracer import get_dummy_tracer
         self.tracer = get_dummy_tracer()
         ddtrace.tracer = self.tracer
 
@@ -25,9 +28,9 @@ def setUp(self):
         app = get_app(config)
         self.app = webtest.TestApp(app)
 
+
 class TestPyramidExplicitTweens(PyramidBase):
     def setUp(self):
-        from tests.test_tracer import get_dummy_tracer
         self.tracer = get_dummy_tracer()
         ddtrace.tracer = self.tracer
 
@@ -38,17 +41,21 @@ def setUp(self):
         app = get_app(config)
         self.app = webtest.TestApp(app)
 
+
 def _include_me(config):
     pass
 
+
+def includeme(config):
+    pass
+
+
 def test_config_include():
     """ This test makes sure that relative imports still work when the
     application is run with ddtrace-run """
     config = Configurator()
     config.include('._include_me')
 
-def includeme(config):
-    pass
 
 def test_include_conflicts():
     """ Test that includes do not create conflicts """
@@ -62,13 +69,3 @@ def test_include_conflicts():
         spans = tracer.writer.pop()
         assert spans
         eq_(len(spans), 1)
-
-
-if __name__ == '__main__':
-    logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
-    ddtrace.tracer.debug_logging = True
-    app = get_app()
-    port = 8080
-    server = make_server('0.0.0.0', port, app)
-    print('running on %s' % port)
-    server.serve_forever()

tox.ini

@@ -55,8 +55,8 @@ envlist =
     {py27,py34,py35,py36}-mysqlconnector{21}
     {py27,py34,py35,py36}-pylibmc{140,150}
     {py27,py34,py35,py36}-pymongo{30,31,32,33,34}-mongoengine{011}
-    {py27,py34,py35,py36}-pyramid{17,18}-webtest
-    {py27,py34,py35,py36}-pyramid-autopatch{17,18}-webtest
+    {py27,py34,py35,py36}-pyramid{17,18,19}-webtest
+    {py27,py34,py35,py36}-pyramid-autopatch{17,18,19}-webtest
     {py27,py34,py35,py36}-requests{208,209,210,211,212,213}
     {py27,py34,py35,py36}-sqlalchemy{10,11}-psycopg2{27}-mysqlconnector{21}
     {py27,py34,py35,py36}-psycopg2{25,26,27}
@@ -174,8 +174,10 @@ deps =
     pymongo34: pymongo>=3.4,<3.5
     pyramid17: pyramid>=1.7,<1.8
     pyramid18: pyramid>=1.8,<1.9
+    pyramid19: pyramid>=1.9,<1.10
     pyramid-autopatch17: pyramid>=1.7,<1.8
     pyramid-autopatch18: pyramid>=1.8,<1.9
+    pyramid-autopatch19: pyramid>=1.9,<1.10
     psycopg225: psycopg2>=2.5,<2.6
     psycopg226: psycopg2>=2.6,<2.7
     psycopg227: psycopg2>=2.7,<2.8
@@ -241,8 +243,8 @@ commands =
     mysqlconnector21: nosetests {posargs} tests/contrib/mysql
     pylibmc{140,150}: nosetests {posargs} tests/contrib/pylibmc
     pymongo{30,31,32,33,34}: nosetests {posargs} tests/contrib/pymongo
-    pyramid{17,18}: nosetests {posargs} tests/contrib/pyramid/test_pyramid.py
-    pyramid-autopatch{17,18}: ddtrace-run nosetests {posargs} tests/contrib/pyramid/test_pyramid_autopatch.py
+    pyramid{17,18,19}: nosetests {posargs} tests/contrib/pyramid/test_pyramid.py
+    pyramid-autopatch{17,18,19}: ddtrace-run nosetests {posargs} tests/contrib/pyramid/test_pyramid_autopatch.py
     mongoengine: nosetests {posargs} tests/contrib/mongoengine
     psycopg2{25,26,27}: nosetests {posargs} tests/contrib/psycopg
     py{34}-aiopg{012,013}: nosetests {posargs} --exclude=".*(test_aiopg_35).*" tests/contrib/aiopg
@@ -329,13 +331,22 @@ setenv =
 setenv =
     {[pyramid_autopatch]setenv}
 
+[testenv:py27-pyramid-autopatch19-webtest]
+setenv =
+    {[pyramid_autopatch]setenv}
+
 [testenv:py34-pyramid-autopatch17-webtest]
 setenv =
     {[pyramid_autopatch]setenv}
+
 [testenv:py34-pyramid-autopatch18-webtest]
 setenv =
     {[pyramid_autopatch]setenv}
 
+[testenv:py34-pyramid-autopatch19-webtest]
+setenv =
+    {[pyramid_autopatch]setenv}
+
 [testenv:py35-pyramid-autopatch17-webtest]
 setenv =
     {[pyramid_autopatch]setenv}
@@ -344,6 +355,10 @@ setenv =
 setenv =
     {[pyramid_autopatch]setenv}
 
+[testenv:py35-pyramid-autopatch19-webtest]
+setenv =
+    {[pyramid_autopatch]setenv}
+
 [testenv:py36-pyramid-autopatch17-webtest]
 setenv =
     {[pyramid_autopatch]setenv}
@@ -352,6 +367,10 @@ setenv =
 setenv =
     {[pyramid_autopatch]setenv}
 
+[testenv:py36-pyramid-autopatch19-webtest]
+setenv =
+    {[pyramid_autopatch]setenv}
+
 
 [django_autopatch]
 setenv =